Fay.Liang
|
1e9024ede9
|
ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m.
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
rpms/awips2.core/Installer.postgres/component.spec
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.tools/component.spec
rpms/python.site-packages/Installer.h5py/component.spec
rpms/python.site-packages/Installer.matplotlib/component.spec
rpms/python.site-packages/Installer.nose/component.spec
rpms/python.site-packages/Installer.pupynere/component.spec
rpms/python.site-packages/Installer.qpid/component.spec
rpms/python.site-packages/Installer.scientific/component.spec
rpms/python.site-packages/Installer.scipy/component.spec
rpms/python.site-packages/Installer.shapely/component.spec
rpms/python.site-packages/Installer.tables/component.spec
Former-commit-id: 6b77894bd0 [formerly c6bd5d7675 ] [formerly 6b77894bd0 [formerly c6bd5d7675 ] [formerly eed6737801 [formerly 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd]]]
Former-commit-id: eed6737801
Former-commit-id: f3ecae8573 [formerly 5cc8e5b4af ]
Former-commit-id: 06ac6b396e
|
2015-01-12 13:03:31 -05:00 |
|
Michael Gamazaychikov
|
9e62b21e10
|
ASM #638 - Inconsistent Type for scale widget value accessed through the varDict.
Change-Id: If81102e5a3b70e224f88a351277e9c29e9f9cc91
Former-commit-id: 6123ee67c1 [formerly 94f06ccbc9 ] [formerly 6123ee67c1 [formerly 94f06ccbc9 ] [formerly 40f0e77f30 [formerly 3c1ce33424799b39db14f909d8de2946e5aca1bc]]]
Former-commit-id: 40f0e77f30
Former-commit-id: 082fb31b94 [formerly ab1c6feb4e ]
Former-commit-id: f9c9765041
|
2014-12-11 19:37:00 -05:00 |
|
Nate Jensen
|
0bb18f02d0
|
Omaha #3549 remove jdt prefs for faster builds
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29
Former-commit-id: 6c1391e938 [formerly ec28d2f1a0 ] [formerly 6c1391e938 [formerly ec28d2f1a0 ] [formerly 8dbe6abbe4 [formerly 3ba611e111585d2aa9cd9f647687fedb794077f7]]]
Former-commit-id: 8dbe6abbe4
Former-commit-id: 1c5057a13f [formerly 291de3f039 ]
Former-commit-id: e53063661e
|
2014-12-03 15:47:10 -06:00 |
|
Max Schenkelberg
|
5ba50b4476
|
Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties
Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa
Former-commit-id: 94fa6f0e30 [formerly 63421a4819 ] [formerly 94fa6f0e30 [formerly 63421a4819 ] [formerly 50825200a1 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]]
Former-commit-id: 50825200a1
Former-commit-id: d1881ffa51 [formerly 1610826d2e ]
Former-commit-id: a47f187f4f
|
2013-07-15 14:26:15 -05:00 |
|
Steve Harris
|
37f2b6e138
|
12.6.1-9 baseline
Former-commit-id: 7c064b6868 [formerly 2c0ff851ca ] [formerly 7c064b6868 [formerly 2c0ff851ca ] [formerly 27afa60345 [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]
Former-commit-id: 27afa60345
Former-commit-id: dc50bc8443 [formerly 4f7bb90bb0 ]
Former-commit-id: d5fa61041b
|
2012-07-10 07:53:49 -05:00 |
|
Steve Harris
|
39ff9954f8
|
12.5.1-15 baseline
Former-commit-id: 8552902906 [formerly b13cbb7e00 ] [formerly 8552902906 [formerly b13cbb7e00 ] [formerly 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 97c4db937e [formerly 676ea3192f ]
Former-commit-id: 9054c5ab6c
|
2012-06-08 13:39:48 -05:00 |
|
Steve Harris
|
74b66d9683
|
12.4.1-4 baseline
Former-commit-id: 750b7543dd [formerly 67a5a68300 ] [formerly 750b7543dd [formerly 67a5a68300 ] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: a2a6a18fae [formerly a4e519f3cd ]
Former-commit-id: 8cd5974f4c
|
2012-04-18 15:18:16 -05:00 |
|
Bryan Kowal
|
7afea63245
|
Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml.
Former-commit-id: 971bf802ac [formerly 2142afe3f1 ] [formerly 971bf802ac [formerly 2142afe3f1 ] [formerly 2b5ee4b940 [formerly 296d2915b17f0086d93e200d4780663bff34edbb]]]
Former-commit-id: 2b5ee4b940
Former-commit-id: a1dbdff475 [formerly 2a7b92ec91 ]
Former-commit-id: 3bcecdfe66
|
2012-01-20 11:37:38 -06:00 |
|
Matt Nash
|
bcc32c10bc
|
Moving 12.1.1 into ss_sync
Former-commit-id: 580e2938d7 [formerly 66be3bec40 ] [formerly 580e2938d7 [formerly 66be3bec40 ] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 82300ccdcf [formerly 1faae42484 ]
Former-commit-id: 21d2361f00
|
2012-01-19 11:53:12 -06:00 |
|
root
|
e2ecdcfe33
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: a02aeb236c [formerly 9f19e3f712 ] [formerly a02aeb236c [formerly 9f19e3f712 ] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 8e80217e59 [formerly 3360eb6c5f ]
Former-commit-id: 377dcd10b9
|
2012-01-06 08:55:05 -06:00 |
|