You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/05/19 22:30:26 UTC
[1/4] ambari git commit: AMBARI-11249. Replace spinner with licensed
spinner.gif (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 2e0fd3d89 -> 8f82a1a0d
AMBARI-11249. Replace spinner with licensed spinner.gif (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8f82a1a0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8f82a1a0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8f82a1a0
Branch: refs/heads/trunk
Commit: 8f82a1a0dee185236acdc434f47f52ef1ff2ee28
Parents: b198020
Author: Alex Antonenko <hi...@gmail.com>
Authored: Tue May 19 23:14:25 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Tue May 19 23:30:19 2015 +0300
----------------------------------------------------------------------
LICENSE.txt | 21 ++++++++++++++++++-
ambari-web/app/assets/img/spinner.gif | Bin 3289 -> 27694 bytes
.../resources/ui/hive-web/tests/img/spinner.gif | Bin 3289 -> 27694 bytes
3 files changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/8f82a1a0/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
index fca7128..e226388 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -681,4 +681,23 @@ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+For SpiffyGif (ambari-web/app/assets/img/spinner.gif,
+contrib/views/hive/src/main/resources/ui/hive-web/tests/img/spinner.gif)
+
+Home: http://spiffygif.com
+Author: https://twitter.com/sean_holbert
+License: SpiffyGif License
+
+You are free to copy and redistribute any images generated from SpiffyGif in any medium or format, even commercially.
+You are permitted to remix, transform, and build upon images generated from SpiffyGif for any purpose, even commercially.
+
+THIS SOFTWARE AND GENERATED IMAGE FILES ARE PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/8f82a1a0/ambari-web/app/assets/img/spinner.gif
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/img/spinner.gif b/ambari-web/app/assets/img/spinner.gif
index 39fcb67..1498819 100644
Binary files a/ambari-web/app/assets/img/spinner.gif and b/ambari-web/app/assets/img/spinner.gif differ
http://git-wip-us.apache.org/repos/asf/ambari/blob/8f82a1a0/contrib/views/hive/src/main/resources/ui/hive-web/tests/img/spinner.gif
----------------------------------------------------------------------
diff --git a/contrib/views/hive/src/main/resources/ui/hive-web/tests/img/spinner.gif b/contrib/views/hive/src/main/resources/ui/hive-web/tests/img/spinner.gif
index 39fcb67..1498819 100644
Binary files a/contrib/views/hive/src/main/resources/ui/hive-web/tests/img/spinner.gif and b/contrib/views/hive/src/main/resources/ui/hive-web/tests/img/spinner.gif differ
[3/4] ambari git commit: AMBARI-11243. Remove-icon for overrides has
"button"-style (alexantonenko)
Posted by al...@apache.org.
AMBARI-11243. Remove-icon for overrides has "button"-style (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b1980207
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b1980207
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b1980207
Branch: refs/heads/trunk
Commit: b1980207eb6e33cbedc536b576838126510471c6
Parents: 3fa6a25
Author: Alex Antonenko <hi...@gmail.com>
Authored: Tue May 19 19:24:08 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Tue May 19 23:30:19 2015 +0300
----------------------------------------------------------------------
ambari-web/app/styles/application.less | 2 +-
ambari-web/app/templates/common/configs/overriddenProperty.hbs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b1980207/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index 7235c98..35c3522 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -1208,7 +1208,7 @@ h1 {
margin-right: 2px;
}
.btn-final{
- background: none repeat scroll 0 0 #fff;
+ background: transparent repeat scroll 0 0 rgba(255, 255, 255, 0);
}
.btn-final .icon-lock{
color: #a6a6a6;
http://git-wip-us.apache.org/repos/asf/ambari/blob/b1980207/ambari-web/app/templates/common/configs/overriddenProperty.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/configs/overriddenProperty.hbs b/ambari-web/app/templates/common/configs/overriddenProperty.hbs
index 9484f7e..8a8df0a 100644
--- a/ambari-web/app/templates/common/configs/overriddenProperty.hbs
+++ b/ambari-web/app/templates/common/configs/overriddenProperty.hbs
@@ -43,7 +43,7 @@
</a>
{{/if}}
{{#isAccessible ADMIN}}
- <a class="btn btn-small" href="#" data-toggle="tooltip"
+ <a class="btn-small" href="#" data-toggle="tooltip"
{{action "removeOverride" overriddenSCP target="view"}}
{{translateAttr data-original-title="common.remove"}}>
<i class="icon-minus-sign"></i>
[2/4] ambari git commit: AMBARI-11225. HDFS configs page: Save alert
appears, when there was no change (alexantonenko)
Posted by al...@apache.org.
AMBARI-11225. HDFS configs page: Save alert appears, when there was no change (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3fa6a252
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3fa6a252
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3fa6a252
Branch: refs/heads/trunk
Commit: 3fa6a25252bc1359bbb40ff4bef2238d56d9103b
Parents: cb83080
Author: Alex Antonenko <hi...@gmail.com>
Authored: Tue May 19 19:11:43 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Tue May 19 23:30:19 2015 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/main/service/info/configs.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/3fa6a252/ambari-web/app/controllers/main/service/info/configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js
index a82dc41..a48f40b 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -831,9 +831,11 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
self.setProperties({
dataIsLoaded: true,
versionLoaded: true,
- hash: self.getHash(),
isInit: false
});
+ Em.run.next(function(){
+ self.set('hash', self.getHash())
+ });
});
},
[4/4] ambari git commit: AMBARI-11241. Wrong service order when
sorting on the allerts page (alexantonenko)
Posted by al...@apache.org.
AMBARI-11241. Wrong service order when sorting on the allerts page (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cb830806
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cb830806
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cb830806
Branch: refs/heads/trunk
Commit: cb8308064bd5851f449fe0be19ee8b72aba9e848
Parents: 2e0fd3d
Author: Alex Antonenko <hi...@gmail.com>
Authored: Tue May 19 19:09:32 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Tue May 19 23:30:19 2015 +0300
----------------------------------------------------------------------
ambari-web/app/views/main/alert_definitions_view.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/cb830806/ambari-web/app/views/main/alert_definitions_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/alert_definitions_view.js b/ambari-web/app/views/main/alert_definitions_view.js
index b20beb3..dceaaf1 100644
--- a/ambari-web/app/views/main/alert_definitions_view.js
+++ b/ambari-web/app/views/main/alert_definitions_view.js
@@ -144,7 +144,7 @@ App.MainAlertDefinitionsView = App.TableView.extend({
*/
serviceSort: sort.fieldView.extend({
column: 3,
- name: 'service.serviceName',
+ name: 'serviceDisplayName',
displayName: Em.I18n.t('common.service'),
type: 'string'
}),