Skip to content

Commit

Permalink
Merge branch 'develop' into bug/CCB-870-Python_space
Browse files Browse the repository at this point in the history
  • Loading branch information
8530 committed May 29, 2019
2 parents 9aaca86 + 6798640 commit 7263d5b
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 55 deletions.
54 changes: 0 additions & 54 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,15 +127,6 @@ package:el6:rh2.2:
arch: x86_64
<<: *package

package:el6-i386:rh2.2:
variables:
latest_version: develop-2-2
release_version: $rh_22_release
short_version: '2.2'
dist: el6
arch: i686
<<: *package

package:el7:rh2.2:
variables:
latest_version: develop-2-2
Expand All @@ -154,15 +145,6 @@ package:el6:rh2.3:
arch: x86_64
<<: *package

package:el6-i386:rh2.3:
variables:
latest_version: develop
release_version: $rh_23_release
short_version: '2.3'
dist: el6
arch: i686
<<: *package

package:el7:rh2.3:
variables:
latest_version: develop
Expand Down Expand Up @@ -210,15 +192,6 @@ test:el6:rh2.2:
arch: x86_64
<<: *test

test:el6-i386:rh2.2:
variables:
latest_version: develop-2-2
release_version: $rh_22_release
short_version: '2.2'
dist: el6
arch: i686
<<: *test

test:el7:rh2.2:
variables:
latest_version: develop-2-2
Expand All @@ -237,15 +210,6 @@ test:el6:rh2.3:
arch: x86_64
<<: *test

test:el6-i386:rh2.3:
variables:
latest_version: develop
release_version: $rh_23_release
short_version: '2.3'
dist: el6
arch: i686
<<: *test

test:el7:rh2.3:
variables:
latest_version: develop
Expand Down Expand Up @@ -342,24 +306,6 @@ deploy-el6-2.0:
- package:el6:rh2.0
<<: *s3

deploy-el6-i386-2.3:
variables:
dist: el6
arch: i686
short_version: '2.3'
dependencies:
- package:el6-i386:rh2.3
<<: *s3

deploy-el6-i386-2.2:
variables:
dist: el6
arch: i686
short_version: '2.2'
dependencies:
- package:el6-i386:rh2.2
<<: *s3

deploy-el6-i386-2.0:
variables:
dist: el6
Expand Down
2 changes: 1 addition & 1 deletion COPYRIGHT
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright � 2012-2017 United States Government, as represented by the Secretary of
Copyright � 2012-2019 United States Government, as represented by the Secretary of
Defense. All rights reserved. Any reproduction of this computer software, or portions thereof,
marked with this legend must also reproduce these markings.

Expand Down
17 changes: 17 additions & 0 deletions HEADER
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
This file is protected by Copyright. Please refer to the COPYRIGHT file
distributed with this source distribution.

This file is part of REDHAWK HardLimit.

REDHAWK HardLimit is free software: you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by the
Free Software Foundation, either version 3 of the License, or (at your
option) any later version.

REDHAWK HardLimit is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
for more details.

You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see http://www.gnu.org/licenses/.

0 comments on commit 7263d5b

Please sign in to comment.