You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by ro...@apache.org on 2019/01/25 21:20:43 UTC
[trafficcontrol] branch master updated: added licensing header and
updated to fix test failure
This is an automated email from the ASF dual-hosted git repository.
rob pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 7974dcf added licensing header and updated to fix test failure
7974dcf is described below
commit 7974dcf331a816285be7e2e88d01734dfd5217fb
Author: mjacks258 <ma...@comcast.com>
AuthorDate: Fri Jan 25 14:16:12 2019 -0700
added licensing header and updated to fix test failure
---
docs/source/admin/quick_howto/cachegroup_fallback.rst | 12 ++++++++++++
.../traffic_ops_golang/cachegroup/cachegroups.go | 2 +-
.../directives/dragAndDrop/dragdropDirective.js | 19 +++++++++++++++++++
.../directives/dragAndDrop/droppableDirective.js | 19 +++++++++++++++++++
.../app/src/common/directives/dragAndDrop/index.js | 19 +++++++++++++++++++
.../modules/form/cacheGroup/_form.cacheGroup.scss | 17 +++++++++++++++++
6 files changed, 87 insertions(+), 1 deletion(-)
diff --git a/docs/source/admin/quick_howto/cachegroup_fallback.rst b/docs/source/admin/quick_howto/cachegroup_fallback.rst
index 4dd9bc0..5f1e553 100644
--- a/docs/source/admin/quick_howto/cachegroup_fallback.rst
+++ b/docs/source/admin/quick_howto/cachegroup_fallback.rst
@@ -1,5 +1,17 @@
..
..
+.. Licensed 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.
+..
.. _cachegroup-fallback-qht:
*******************************
diff --git a/traffic_ops/traffic_ops_golang/cachegroup/cachegroups.go b/traffic_ops/traffic_ops_golang/cachegroup/cachegroups.go
index 1ab8789..b414314 100644
--- a/traffic_ops/traffic_ops_golang/cachegroup/cachegroups.go
+++ b/traffic_ops/traffic_ops_golang/cachegroup/cachegroups.go
@@ -163,7 +163,7 @@ func (cg TOCacheGroup) Validate() error {
return err
}
- if cg.Fallbacks != nil {
+ if cg.Fallbacks != nil && len(*cg.Fallbacks) > 0 {
isValid, err := cg.isAllowedToFallback(*cg.TypeID)
if err != nil {
return err
diff --git a/traffic_portal/app/src/common/directives/dragAndDrop/dragdropDirective.js b/traffic_portal/app/src/common/directives/dragAndDrop/dragdropDirective.js
index d4d08c6..1781611 100644
--- a/traffic_portal/app/src/common/directives/dragAndDrop/dragdropDirective.js
+++ b/traffic_portal/app/src/common/directives/dragAndDrop/dragdropDirective.js
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
var DndEnable = function($compile) {
return {
restrict: 'A', // use as an Attribute only
diff --git a/traffic_portal/app/src/common/directives/dragAndDrop/droppableDirective.js b/traffic_portal/app/src/common/directives/dragAndDrop/droppableDirective.js
index 6712d3e..36baa36 100644
--- a/traffic_portal/app/src/common/directives/dragAndDrop/droppableDirective.js
+++ b/traffic_portal/app/src/common/directives/dragAndDrop/droppableDirective.js
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
var DroppableDirective = function () {
return {
scope: {
diff --git a/traffic_portal/app/src/common/directives/dragAndDrop/index.js b/traffic_portal/app/src/common/directives/dragAndDrop/index.js
index 8e0c771..0fb8bd8 100644
--- a/traffic_portal/app/src/common/directives/dragAndDrop/index.js
+++ b/traffic_portal/app/src/common/directives/dragAndDrop/index.js
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
//application directives
module.exports = angular.module('trafficPortal.directives.dragAndDrop',[])
.directive('dndEnable', require('./dragdropDirective'))
diff --git a/traffic_portal/app/src/common/modules/form/cacheGroup/_form.cacheGroup.scss b/traffic_portal/app/src/common/modules/form/cacheGroup/_form.cacheGroup.scss
index 6c2bae6..e8854c1 100644
--- a/traffic_portal/app/src/common/modules/form/cacheGroup/_form.cacheGroup.scss
+++ b/traffic_portal/app/src/common/modules/form/cacheGroup/_form.cacheGroup.scss
@@ -1,3 +1,20 @@
+/*
+
+
+ Licensed 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.
+
+*/
+
.allFallbacks{
margin-top: 10px;
}