Merge remote-tracking branch 'upstream/develop'

saltstack · May 23, 2016 · 3d44019 · 3d44019
2 parents 9e6778a + 5440cba
commit 3d44019
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,16 @@
+   Salt - Remote execution system
+
+   Copyright 2014-2016 SaltStack Team
+
+   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.
+