~johnsca/charms/trusty/cf-webadmin/trunk

  • Committer: Whit Morriss
  • Date: 2014-10-28 14:37:41 UTC
  • mfrom: (26.1.2 trunk)
  • Revision ID: whit.morriss@canonical.com-20141028143741-211suz8eqnycy3tr
Merge branch 'master' of github.com:whitmo/cf-admin-ui

Conflicts:
        hooks/actions.py
Filename Latest Rev Last Changed Committer Comment Size
..
hooks 1 9 years ago Whi Morriss initial commit of cf-admin charm Diff
templates 1 9 years ago Whi Morriss initial commit of cf-admin charm Diff
tests 1 9 years ago Whi Morriss initial commit of cf-admin charm Diff
unit_tests 1 9 years ago Whi Morriss initial commit of cf-admin charm Diff
.gitignore 22 9 years ago Cory Johns Fixed path issue and included UAADBRelation 9 bytes Diff Download File
config.yaml 1 9 years ago Whi Morriss initial commit of cf-admin charm 375 bytes Diff Download File
helpers.sh 26 9 years ago Whit Morriss install our own gemfile lock file - to workaroun 144 bytes Diff Download File
icon.svg 1 9 years ago Whi Morriss initial commit of cf-admin charm 9.8 KB Diff Download File
metadata.yaml 18 9 years ago Cory Johns Fixed uaa interface and added uaa-db relation 448 bytes Diff Download File
README.md 14 9 years ago Whit Morriss add a readme 107 bytes Diff Download File