You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2016/04/13 18:11:47 UTC
[1/2] storm git commit: STORM-1706: Add RELEASE and storm-env.sh to
storm-diet assembly
Repository: storm
Updated Branches:
refs/heads/1.x-branch 07dd1b1bb -> 374934c16
STORM-1706: Add RELEASE and storm-env.sh to storm-diet assembly
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5e62b7b3
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5e62b7b3
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5e62b7b3
Branch: refs/heads/1.x-branch
Commit: 5e62b7b36283c1e257395c59237e699067298bd1
Parents: 07dd1b1
Author: Priyank <ps...@hortonworks.com>
Authored: Tue Apr 12 11:46:21 2016 -0700
Committer: Priyank <ps...@hortonworks.com>
Committed: Tue Apr 12 11:46:21 2016 -0700
----------------------------------------------------------------------
storm-dist/binary/src/main/assembly/binary.xml | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/5e62b7b3/storm-dist/binary/src/main/assembly/binary.xml
----------------------------------------------------------------------
diff --git a/storm-dist/binary/src/main/assembly/binary.xml b/storm-dist/binary/src/main/assembly/binary.xml
index 648640e..d524530 100644
--- a/storm-dist/binary/src/main/assembly/binary.xml
+++ b/storm-dist/binary/src/main/assembly/binary.xml
@@ -375,6 +375,18 @@
<destName>storm_env.ini</destName>
<fileMode>0644</fileMode>
</file>
+ <file>
+ <source>${project.basedir}/../../conf/storm-env.sh</source>
+ <outputDirectory>/conf</outputDirectory>
+ <destName>storm-env.sh</destName>
+ <fileMode>0755</fileMode>
+ </file>
+ <file>
+ <source>${project.basedir}/../../VERSION</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>RELEASE</destName>
+ <filtered>true</filtered>
+ </file>
<!-- TODO this should be a generated file from "target" -->
<file>
<source>${project.basedir}/../../log4j2/cluster.xml</source>
[2/2] storm git commit: Added STORM-1706 to CHANGELOG.
Posted by sr...@apache.org.
Added STORM-1706 to CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/374934c1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/374934c1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/374934c1
Branch: refs/heads/1.x-branch
Commit: 374934c161e6122f52dc4cbc706aa089c742b42a
Parents: 5e62b7b
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Wed Apr 13 09:10:45 2016 -0700
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Wed Apr 13 09:10:45 2016 -0700
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/374934c1/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b676e35..522fe92 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 1.0.0
+ * STORM-1706: Add RELEASE and storm-env.sh to storm-diet assembly
* STORM-1613: Upgraded HBase version to 1.1.0
* STORM-1687: divide by zero in stats
* STORM-1670: LocalState#get(String) can throw FileNotFoundException which may result supervisor.clj#sync-processes stop assigning new workers/assignments