storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject [7/8] git commit: Merge branch 'master' into security
Date Thu, 12 Jun 2014 16:02:08 GMT
Merge branch 'master' into security


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

Branch: refs/heads/security
Commit: 41615b3c4b174077ac1c729af4aef32e5b79d3c5
Parents: 2131a0a 2a60e99
Author: Robert (Bobby) Evans <bobby@apache.org>
Authored: Thu Jun 12 10:59:46 2014 -0500
Committer: Robert (Bobby) Evans <bobby@apache.org>
Committed: Thu Jun 12 10:59:46 2014 -0500

----------------------------------------------------------------------
 LICENSE                                         | 39 +++++++++++++++++++-
 external/storm-kafka/README.md                  | 33 ++++++++++++++---
 .../storm/kafka/DynamicBrokersReaderTest.java   | 17 +++++++++
 .../src/test/storm/kafka/KafkaErrorTest.java    | 17 +++++++++
 .../src/test/storm/kafka/KafkaTestBroker.java   | 17 +++++++++
 .../src/test/storm/kafka/KafkaUtilsTest.java    | 17 +++++++++
 .../storm/kafka/StringKeyValueSchemeTest.java   | 17 +++++++++
 .../src/test/storm/kafka/TestUtils.java         | 17 +++++++++
 .../src/test/storm/kafka/ZkCoordinatorTest.java | 17 +++++++++
 .../test/storm/kafka/bolt/KafkaBoltTest.java    | 17 +++++++++
 pom.xml                                         | 11 +++++-
 .../netty/NettyRenameThreadFactory.java         | 17 +++++++++
 .../jvm/backtype/storm/multilang/BoltMsg.java   | 17 +++++++++
 .../backtype/storm/multilang/ISerializer.java   | 17 +++++++++
 .../storm/multilang/JsonSerializer.java         | 17 +++++++++
 .../storm/multilang/NoOutputException.java      | 17 +++++++++
 .../jvm/backtype/storm/multilang/ShellMsg.java  | 17 +++++++++
 .../jvm/backtype/storm/multilang/SpoutMsg.java  | 17 +++++++++
 .../trident/state/map/RemovableMapState.java    | 17 +++++++++
 storm-core/src/ui/public/component.html         | 16 ++++++++
 storm-core/src/ui/public/index.html             | 16 ++++++++
 storm-core/src/ui/public/js/visualization.js    | 20 +++++++++-
 .../templates/component-page-template.html      | 17 +++++++++
 .../public/templates/index-page-template.html   | 16 ++++++++
 .../public/templates/json-error-template.html   | 16 ++++++++
 .../templates/topology-page-template.html       | 16 ++++++++
 storm-core/src/ui/public/topology.html          | 17 +++++++++
 storm-dist/binary/LICENSE                       | 39 +++++++++++++++++++-
 28 files changed, 518 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/41615b3c/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/41615b3c/storm-core/src/ui/public/component.html
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/41615b3c/storm-core/src/ui/public/index.html
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/41615b3c/storm-core/src/ui/public/templates/index-page-template.html
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/41615b3c/storm-core/src/ui/public/templates/topology-page-template.html
----------------------------------------------------------------------
diff --cc storm-core/src/ui/public/templates/topology-page-template.html
index fe718dd,af5e16f..525fcd8
--- a/storm-core/src/ui/public/templates/topology-page-template.html
+++ b/storm-core/src/ui/public/templates/topology-page-template.html
@@@ -1,16 -1,22 +1,32 @@@
+ <!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+ 
+      http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+ -->
  <script id="topology-summary-template" type="text/html">
    <table id="topology-summary-table">
 -    <thead><tr><th><span class="tip right" title="The name given to
the topology by when it was submitted.">Name</span></th><th><span
class="tip right" title="The unique ID given to a Topology each time it is launched.">Id</span></th><th><span
class="tip above" title="The status can be one of ACTIVE, INACTIVE, KILLED, or REBALANCING.">Status</span></th><th><span
class="tip above" title="The time since the Topology was submitted.">Uptime</span></th><th><span
class="tip above" title="The number of Workers (processes).">Num workers</span></th><th><span
class="tip above" title="Executors are threads in a Worker process.">Num executors</span></th><th><span
class="tip above" title="A Task is an instance of a Bolt or Spout. The number of Tasks is
almost always equal to the number of Executors.">Num tasks</span></th></tr></thead>
 +    <thead><tr>
 +      <th><span class="tip right" title="The name given to the topology by when
it was submitted.">Name</span></th>
 +      <th><span class="tip right" title="The unique ID given to a Topology each
time it is launched.">Id</span></th>
 +      <th><span class="tip above" title="The user that submitted the Topology,
if authentication is enabled.">Owner</span></th>
 +      <th><span class="tip above" title="The status can be one of ACTIVE, INACTIVE,
KILLED, or REBALANCING.">Status</span></th>
 +      <th><span class="tip above" title="The time since the Topology was submitted.">Uptime</span></th>
 +      <th><span class="tip above" title="The number of Workers (processes).">Num
workers</span></th>
 +      <th><span class="tip above" title="Executors are threads in a Worker process.">Num
executors</span></th>
 +      <th><span class="tip above" title="A Task is an instance of a Bolt or Spout.
The number of Tasks is almost always equal to the number of Executors.">Num tasks</span></th>
 +      <th><span class="tip left" title="This shows information from the scheduler
about the latest attempt to schedule the Topology on the cluster.">Scheduler Info</span></th>
 +    </tr></thead>
      <tbody>
        <tr>
          <td>{{name}}</td>

http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/41615b3c/storm-core/src/ui/public/topology.html
----------------------------------------------------------------------


Mime
View raw message