accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1468988 - in /accumulo/trunk: ./ assemble/ bin/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ src/
Date Wed, 17 Apr 2013 16:07:04 GMT
Author: ecn
Date: Wed Apr 17 16:07:03 2013
New Revision: 1468988

URL: http://svn.apache.org/r1468988
Log:
ACCUMULO-1276 found another xml-unfriendly character (&)

Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/assemble/   (props changed)
    accumulo/trunk/bin/generate_monitor_certificate.sh
    accumulo/trunk/core/   (props changed)
    accumulo/trunk/examples/   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java 
 (props changed)
    accumulo/trunk/pom.xml   (props changed)
    accumulo/trunk/server/   (props changed)
    accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5:r1468983

Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/assemble:r1468983

Modified: accumulo/trunk/bin/generate_monitor_certificate.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/bin/generate_monitor_certificate.sh?rev=1468988&r1=1468987&r2=1468988&view=diff
==============================================================================
--- accumulo/trunk/bin/generate_monitor_certificate.sh (original)
+++ accumulo/trunk/bin/generate_monitor_certificate.sh Wed Apr 17 16:07:03 2013
@@ -28,8 +28,8 @@ bin="$( cd -P "$( dirname "$SOURCE" )" &
 . "$bin"/config.sh
 
 ALIAS="default"
-KEYPASS=$(tr -dc '#-~' < /dev/urandom | tr -d '<>' | head -c 20)
-STOREPASS=$(tr -dc '#-~' < /dev/urandom | tr -d '<>' | head -c 20)
+KEYPASS=$(tr -dc '#-~' < /dev/urandom | tr -d '<>&' | head -c 20)
+STOREPASS=$(tr -dc '#-~' < /dev/urandom | tr -d '<>&' | head -c 20)
 KEYSTOREPATH="$ACCUMULO_HOME/conf/keystore.jks"
 TRUSTSTOREPATH="$ACCUMULO_HOME/conf/cacerts.jks"
 CERTPATH="$ACCUMULO_HOME/conf/server.cer"

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/core:r1468983

Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/examples:r1468983

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1468983

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1468983

Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/pom.xml:r1468983

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/server:r1468983

Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/src:r1468983



Mime
View raw message