incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [3/3] git commit: Merge branch 'master' into 0.2.0-newtypesystem
Date Sun, 11 Aug 2013 14:20:08 GMT
Merge branch 'master' into 0.2.0-newtypesystem


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

Branch: refs/heads/0.2.0-newtypesystem
Commit: 64c9bcd0506ceb3145dd64956084cfe146b3e087
Parents: c2c7c2e 08f8211
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Sun Aug 11 10:19:57 2013 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Sun Aug 11 10:19:57 2013 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/blur/shell/Main.java   | 43 ++++++++++++++++++--
 distribution/src/main/scripts/bin/blur          |  8 ++--
 .../main/scripts/bin/start-controller-server.sh |  4 +-
 .../src/main/scripts/bin/start-shard-server.sh  |  4 +-
 .../main/scripts/bin/start-zookeeper-server.sh  |  4 +-
 .../src/main/scripts/conf/log4j-command.xml     | 37 +++++++++++++++++
 distribution/src/main/scripts/conf/log4j.xml    |  6 +--
 7 files changed, 90 insertions(+), 16 deletions(-)
----------------------------------------------------------------------



Mime
View raw message