usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [2/3] git commit: Merge branch 'two-dot-o' of github.com:usergrid/usergrid into two-dot-o
Date Tue, 04 Feb 2014 12:20:40 GMT
Merge branch 'two-dot-o' of github.com:usergrid/usergrid into two-dot-o


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

Branch: refs/heads/two-dot-o
Commit: 45e04ac2106715afc9c533cc8de84913b421b442
Parents: 1af59d4 50a3f74
Author: Todd Nine <tnine@apigee.com>
Authored: Tue Feb 4 04:24:44 2014 -0700
Committer: Todd Nine <tnine@apigee.com>
Committed: Tue Feb 4 04:24:44 2014 -0700

----------------------------------------------------------------------
 .../priamcluster/cassandra-cf.json              |  36 ++++-----
 stack/corepersistence/priamcluster/pom.xml      |  29 +++++++-
 .../src/main/dist/conf/Priam.properties         |  10 +--
 .../src/main/dist/init_instance/create_raid0.sh |  32 ++++++++
 .../src/main/dist/init_instance/init_cass.sh    |  73 -------------------
 .../main/dist/init_instance/init_instance.sh    |  54 ++++++++++++++
 .../dist/init_instance/install_cassandra.sh     |  56 ++++++++++++++
 .../dist/init_instance/install_elasticsearch.sh |  24 ++++++
 .../dist/init_instance/install_oraclejdk.sh     |   3 +
 .../src/main/dist/lib/priam-agent-1.2.24.jar    | Bin 0 -> 33020 bytes
 .../dist/lib/priam-cass-extensions-1.2.24.jar   | Bin 0 -> 5478 bytes
 .../priam-cass-extensions-2.0.0-SNAPSHOT.jar    | Bin 5478 -> 0 bytes
 .../src/main/dist/webapps/priam-web-1.2.24.war  | Bin 0 -> 31272443 bytes
 .../dist/webapps/priam-web-2.0.0-SNAPSHOT.war   | Bin 31266622 -> 0 bytes
 .../src/main/groovy/configure_cassandra.groovy  |  12 +--
 .../main/groovy/configure_elasticsearch.groovy  |  47 ++++++++++++
 .../src/main/groovy/registry_clear.groovy       |   2 +-
 .../src/main/groovy/registry_list.groovy        |   2 +-
 .../src/main/groovy/registry_register.groovy    |   3 +-
 .../src/main/groovy/wait_for_cassandra.groovy   |  42 -----------
 .../src/main/groovy/wait_for_instances.groovy   |  44 +++++++++++
 21 files changed, 313 insertions(+), 156 deletions(-)
----------------------------------------------------------------------



Mime
View raw message