incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chipchild...@apache.org
Subject [1/6] git commit: Merge branch 'master' into junit-tests
Date Tue, 25 Sep 2012 19:07:46 GMT
Updated Branches:
  refs/heads/junit-tests 2b8c0d474 -> f485bdab5


Merge branch 'master' into junit-tests


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f485bdab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f485bdab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/f485bdab

Branch: refs/heads/junit-tests
Commit: f485bdab593d6c6f411ed30b1f64404e392f026a
Parents: 2b8c0d4 8435e72
Author: Chip Childers <chip.childers@gmail.com>
Authored: Tue Sep 25 15:07:32 2012 -0400
Committer: Chip Childers <chip.childers@gmail.com>
Committed: Tue Sep 25 15:07:32 2012 -0400

----------------------------------------------------------------------
 LICENSE                                            |   18 ++++
 .../config/root/redundant_router/backup.sh.templ   |   16 ++++
 .../root/redundant_router/check_heartbeat.sh.templ |   17 ++++
 .../root/redundant_router/checkrouter.sh.templ     |   17 ++++
 .../root/redundant_router/enable_pubip.sh.templ    |   16 ++++
 .../config/root/redundant_router/fault.sh.templ    |   16 ++++
 .../root/redundant_router/heartbeat.sh.templ       |   16 ++++
 .../config/root/redundant_router/master.sh.templ   |   16 ++++
 pom.xml                                            |   51 +++++++-----
 server/src/com/cloud/user/AccountManagerImpl.java  |    2 +-
 tools/whisker/descriptor.xml                       |   64 ++++++++-------
 11 files changed, 197 insertions(+), 52 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f485bdab/pom.xml
----------------------------------------------------------------------


Mime
View raw message