165 commits

Author	SHA1	Message	Date
Bryan Kowal	9d54be13f0	Issue #1490 - updated edex-environment ... - actually include the modified files in the commit this time - each edex environment will now receive its own instance of pypies - a httpd-pypies port and a pypies logging port must now be specified when creating an edex environment - the location of the pypies configuration file is no longer hard-coded; specified as an environment variable - made the pypies tcp logging port configurable - add source headers - the configuration will now update the ServerRoot Change-Id: Ie4130caad91f027c9ab547806fb014c0e708596d Former-commit-id: 3a0114558b [formerly 792c03d5f4] [formerly b4964c0a19] [formerly 3a0114558b [formerly 792c03d5f4] [formerly b4964c0a19] [formerly 9e33969536 [formerly b4964c0a19 [formerly c96d7532679555f3ccf8a0d7bc07866e63ac177f]]]] Former-commit-id: 9e33969536 Former-commit-id: a9c31457b8 [formerly bc757e5bc1] [formerly 912fb037ce61d59d861a7468a62b5455d51ea0aa [formerly b47d484e70]] Former-commit-id: 6761c929373e609a39f863ab492cf3ace10a97b7 [formerly 75d8250852] Former-commit-id: 7ae14fdb20	2013-01-18 12:44:37 -06:00
Roger Ferrel	815dd12ad9	Issue #1442 Changes to update display when Simulated Time is changed. Corrections to pqact.conf.template. ... Changes based on code review and added listener to GridManager and unit test. Change-Id: Ida593a7e3cc7d4fd9bd6f44a4455145114484650 Former-commit-id: 863bdb4d52 [formerly 972db12324] [formerly 1cd076671c] [formerly 863bdb4d52 [formerly 972db12324] [formerly 1cd076671c] [formerly 1e492b81ff [formerly 1cd076671c [formerly 7f70c2f65453db6bf3097ae8157511c38a36b136]]]] Former-commit-id: 1e492b81ff Former-commit-id: 96deac5f43 [formerly 86d51634dc] [formerly ea2ddcc686b917f0c5feca15fbe115c2be0949d6 [formerly f10521f861]] Former-commit-id: 06cef0013d52ca86020642bf82ef1a6b6988048f [formerly 722708105f] Former-commit-id: 0435636b1e	2013-01-16 16:53:29 -06:00
Richard Peter	0a55bcfd67	Merge branch 'ss_builds' (13.2.1-1) into development ... Conflicts: cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template Former-commit-id: 6e42fa32d3 [formerly a966546e31] [formerly 3fb7d96ec1] [formerly 6e42fa32d3 [formerly a966546e31] [formerly 3fb7d96ec1] [formerly 1dbb34523b [formerly 3fb7d96ec1 [formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]]] Former-commit-id: 1dbb34523b Former-commit-id: d880361e06 [formerly 79ef100838] [formerly 85a5d2a8fdf64c0ba9efe9815c5ef9cb8f27eb62 [formerly 345dfd2ca9]] Former-commit-id: ef42f50f6a062518b4a0d8effc537eaf4c7292a1 [formerly cd2014bf8d] Former-commit-id: e838f2db25	2013-01-14 18:07:17 -06:00
Steve Harris	e5f32a2bbe	13.2.1-1 baseline ... Former-commit-id: 8dd688c878 [formerly 5dfe4d10f1] [formerly e62172c8c7] [formerly 8dd688c878 [formerly 5dfe4d10f1] [formerly e62172c8c7] [formerly 81849e3cbb [formerly e62172c8c7 [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]]] Former-commit-id: 81849e3cbb Former-commit-id: 3d35fd52d5 [formerly e34695538d] [formerly c835df6c612355b23abcc04a384d5b398d1c5ec6 [formerly 8713dfc5ca]] Former-commit-id: d5a28dcde502767d0f84d7301207580849e0a584 [formerly ebff2a6275] Former-commit-id: b4556ea28f	2013-01-14 18:42:21 -05:00
Richard Peter	031bae3bfd	Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development ... Conflicts: cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/dbscandb.c ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/proto_gemlib.h ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/uscore.h ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/EnsembleSelectComposite.java ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcEnsembleResourceData.java Former-commit-id: 4e1f66abb3 [formerly ae3ea75cbf] [formerly 1318f53902] [formerly 4e1f66abb3 [formerly ae3ea75cbf] [formerly 1318f53902] [formerly b8e42dabc0 [formerly 1318f53902 [formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]]] Former-commit-id: b8e42dabc0 Former-commit-id: 9da3b7e2dd [formerly fa6247baf7] [formerly bb2a6cb1f185f4b5c4f896fbc2ccaf6004754a84 [formerly aa9e16b038]] Former-commit-id: 353348b43765265bcb9885b4db6864c6e23d0b07 [formerly 096134d917] Former-commit-id: ef2dc06b69	2013-01-14 17:38:38 -06:00
Steve Harris	32c48861de	13.1.2-8 baseline ... Former-commit-id: 5aaacf4eec [formerly b864fdc303] [formerly e6217a17de] [formerly 5aaacf4eec [formerly b864fdc303] [formerly e6217a17de] [formerly 06b8eb8db0 [formerly e6217a17de [formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]]] Former-commit-id: 06b8eb8db0 Former-commit-id: 13be9f8987 [formerly 7d0109a349] [formerly d0dddac1b9c0f73936bff6a2a8424513b3f8a42d [formerly 3caf592e83]] Former-commit-id: 93a11a781554c0d3f113b98ce41624b35a753e8d [formerly 066c14dcd2] Former-commit-id: 92f1e9416c	2013-01-11 16:19:07 -05:00
Richard Peter	7d529beed2	Issue #1408: Merge 13.1.2-6 into development ... Former-commit-id: 95f0508c29 [formerly d0a6ba23e5] [formerly 029ebaa63a] [formerly 95f0508c29 [formerly d0a6ba23e5] [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 029ebaa63a [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]] Former-commit-id: 328be6ac2b Former-commit-id: 177a54d19a [formerly 80bf1d7a28] [formerly e62c56e99c7920d8884c0d3271ccfd750504bf46 [formerly 6a5a0d7d09]] Former-commit-id: 8e36b37de071d25b4a9a89babcf0974ae973fdbe [formerly 709af3b25e] Former-commit-id: 398b47967d	2013-01-09 17:55:05 -06:00
Bryan Kowal	904678e8f4	Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline ... Former-commit-id: 199e202979 [formerly ab8b346489] [formerly c8a43edd9e] [formerly 199e202979 [formerly ab8b346489] [formerly c8a43edd9e] [formerly d6b4cb65f4 [formerly c8a43edd9e [formerly b535a90fb25287945485c10b3c85749c11285171]]]] Former-commit-id: d6b4cb65f4 Former-commit-id: 0e985cf0f3 [formerly 6d7f57c62a] [formerly acd3a92b4c1f1e4b7e0fc18eb618a5d77643ccb8 [formerly 146c43a606]] Former-commit-id: caceba3a84e843b279eb8a807b33e26d81487e49 [formerly 0136f9d5a3] Former-commit-id: 1996f92f7e	2013-01-07 12:16:01 -06:00
Steve Harris	3e63f280a2	13.1.2-6 baseline ... Former-commit-id: 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]] Former-commit-id: 59969775ad Former-commit-id: fe763963e9 [formerly 82a1ed77a4] [formerly fa884fbcd584330564fea44a1538e11036e753a8 [formerly dbcae57f57]] Former-commit-id: 385d5b42196eb703cc60637c47506c02c454b5fc [formerly 05bdc0ecd2] Former-commit-id: b7f180d9d3	2013-01-06 14:55:11 -06:00
Steve Harris	745f2c6409	13.1.2-2 baseline ... Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]] Former-commit-id: 4ba416aeb3 Former-commit-id: 82cdde8491 [formerly cd4185ef5c] [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]] Former-commit-id: c69e1900269e630aefc061c2464bc8fea1c9776a [formerly b6fa9b4858] Former-commit-id: f52ec0b0a0	2013-01-06 14:32:24 -06:00
Bryan Kowal	5ca7008802	Issue #1373 - prevent file naming conflicts ... Change-Id: Ibf3996983a0df3eee39fd5bc7d65bf43044c0e02 Former-commit-id: a4576aeb23 [formerly 94fe1c8f59] [formerly 9079c2dd3f] [formerly a4576aeb23 [formerly 94fe1c8f59] [formerly 9079c2dd3f] [formerly 2c9e5d68fa [formerly 9079c2dd3f [formerly b7c11d1a5d55908a9e60e29b68fa01bf924c1429]]]] Former-commit-id: 2c9e5d68fa Former-commit-id: 9cea52c3bd [formerly 5aed64be97] [formerly 9dd0aeae5d8737f589956e4d1a2827d65b6fc693 [formerly 6580901b03]] Former-commit-id: a947744e5f5de62fe560f0217c5e2740f6988cc9 [formerly ad30a7fb6a] Former-commit-id: 7138f2a20f	2013-01-05 10:40:10 -06:00
Bryan Kowal	95c7ef5aa6	Issue #1373 - the edexServiceList script will now be packaged in the edex-base and the datadelivery rpms ... Former-commit-id: 09fe6a9c03 [formerly 2d9e54ddf8] [formerly 9062ed93d7] [formerly 09fe6a9c03 [formerly 2d9e54ddf8] [formerly 9062ed93d7] [formerly e131b5bc72 [formerly 9062ed93d7 [formerly 96fe189b5af5fbf0424504cc0b27d44c1defc0c2]]]] Former-commit-id: e131b5bc72 Former-commit-id: 2cb595f8bb [formerly ce21e23e52] [formerly 4cab8f42ca65f8a1e9fd3656f1c5391c169ad000 [formerly 8a4bc85bad]] Former-commit-id: c01dc89b759f5950dcb70e67442b4d828bcb5b58 [formerly d2cd60bb5c] Former-commit-id: a14d25ded0	2013-01-04 12:50:37 -06:00
Richard Peter	7aaec36c1f	Issue #1373: Update jvm startup to load a service list for services to start. ... Former-commit-id: f941605942 [formerly af5b616282] [formerly 1c560f5013] [formerly f941605942 [formerly af5b616282] [formerly 1c560f5013] [formerly c1765f776c [formerly 1c560f5013 [formerly b58fed7cb8f04d26397eb9df2273be6588737035]]]] Former-commit-id: c1765f776c Former-commit-id: 38c6856d3c [formerly 9f991104dd] [formerly b3978f7df010c7a6841e8680eae5b357ababaca4 [formerly 424cb12ef6]] Former-commit-id: 56d8351962d633cfe957c08f60babdaea17194e8 [formerly 6fd64a20fa] Former-commit-id: e8d1469a70	2013-01-03 16:27:32 -06:00
Richard Peter	a78970da48	Merge "Issue #1411 Corrections to pqact.con.template and fix in palt.c to handle data patterns properly." into development ... Former-commit-id: 218b69a387 [formerly 314bcffd15] [formerly c3e9f40479] [formerly 218b69a387 [formerly 314bcffd15] [formerly c3e9f40479] [formerly 45f901c1b0 [formerly c3e9f40479 [formerly da48ac436f44dcff85723dfd5befaee9101b6978]]]] Former-commit-id: 45f901c1b0 Former-commit-id: 38ae6f7f0a [formerly a608ba1a88] [formerly f773ae0c7fbeaee4d49304db8a1346465706b19a [formerly 54778e7490]] Former-commit-id: cf8ab4529958f51c5a76113bfdaf60b39b30dab3 [formerly 7c4641be8e] Former-commit-id: cec63c30c7	2012-12-18 13:08:40 -06:00
Roger Ferrel	c0e1ddbbea	Issue #1411 Corrections to pqact.con.template and fix in palt.c to handle data patterns properly. ... Change-Id: I1f9f5b25d833c14031b9eb257c175de81bc146dc Former-commit-id: ecec7603df [formerly 8c4e70fa9a] [formerly 0c5d10e66a] [formerly ecec7603df [formerly 8c4e70fa9a] [formerly 0c5d10e66a] [formerly 43fd607a30 [formerly 0c5d10e66a [formerly c1567c66f77077f9411a04f349a17d368424db5f]]]] Former-commit-id: 43fd607a30 Former-commit-id: 50d3a97bcc [formerly 07fbeb2928] [formerly 6ca37b251db62a9996f567e8425299a3fb6ce14e [formerly 6d4946290f]] Former-commit-id: 78c26237d387d6f1192593fb48dd3b17a26a6cb5 [formerly 95e6d9e752] Former-commit-id: 7143fb78dd	2012-12-18 09:00:46 -06:00
Bryan Kowal	15db8f220d	Issue #1416: added the python package shapely ... - shapely and dependencies will now be built as part of the 32-bit build and the 64-bit build from source - shapely will also be included as part of the AWIPS II MSFT Windows environment Former-commit-id: efe8f338b0 [formerly ef0b12813d] [formerly 8d1e29448a] [formerly efe8f338b0 [formerly ef0b12813d] [formerly 8d1e29448a] [formerly 5e22c24657 [formerly 8d1e29448a [formerly 82872ebbfb8f2793fb7d95842d33ba8a0cd41ae6]]]] Former-commit-id: 5e22c24657 Former-commit-id: f8df1139b2 [formerly 976834171e] [formerly 6b0159b5868c1e9370ac2d621cc75a1b66d8575f [formerly 6103e7c485]] Former-commit-id: 4b295307c700c42336969a858b4e15f0db107e36 [formerly bf96e5cf59] Former-commit-id: f48df7de50	2012-12-17 15:27:43 -06:00
Bryan Kowal	8b97e53cd3	Issue #1262: ... - We will now be building a 64-bit version of the awips2-notification rpm - Updated qpid-devel in nativeLib to match the version of qpid we are using - Added 64-bit libraries to thrift and qpid in nativeLib - The notification executables are now built from source out of nativeLib - Updated build-notification.sh for compatibility with automated builds Change-Id: I4d014e64a014010caa6a89e17ff3edb44000d396 Former-commit-id: 8d50e95643 [formerly 7fb4e993e6] [formerly 660a9b615f] [formerly 8d50e95643 [formerly 7fb4e993e6] [formerly 660a9b615f] [formerly f39489c44c [formerly 660a9b615f [formerly 0c579409321e8be6ea9bf2c98c44769fcdf28dcc]]]] Former-commit-id: f39489c44c Former-commit-id: 10960c5d62 [formerly 8579adf932] [formerly edcca021807dc76971231ad55a5724539778b5ee [formerly c44c4bd061]] Former-commit-id: 3a025000c2fc42946086a1aefc9fe80303863bba [formerly f256955776] Former-commit-id: 7e19ae6378	2012-12-16 21:40:26 -06:00
Richard Peter	f0aa37e7e3	Revert "Issue #1262:" ... This reverts commit 1b76ff6159 [formerly 95a0a4664f] [formerly d1930ad031c0d2a89cee21d8471ec1e59e0c331d [formerly 83e1f8cc0a]] [formerly 333e7ab7d4 [formerly bad53d1b7f] [formerly 9daf66759db7f15cffd920e394ee9cbc9ce0ff8c [formerly 9490652103]]] [formerly 0970259114] [formerly 2f31d21ac3 [formerly c3da463f39] [formerly a210f08acc] [formerly 2f31d21ac3 [formerly c3da463f39] [formerly a210f08acc] [formerly 0970259114 [formerly a210f08acc [formerly 3205e61aaeba7ec7bccb0a4bd2ed8a6e83a77951]]]]] Former-commit-id: 80a95c53ba [formerly 9d03a53fb5] [formerly 9a7cfa2383] [formerly 80a95c53ba [formerly 9d03a53fb5] [formerly 9a7cfa2383] [formerly f37f948456 [formerly 9a7cfa2383 [formerly a4e51a9f814ff0e004be46460b6d27a848cb2fe9]]]] Former-commit-id: f37f948456 Former-commit-id: 785b6c7bfe [formerly 2100b136a9] [formerly efeeaf09bb60e407eb7f16418882f2261396e41e [formerly 48641ca26f]] Former-commit-id: e34ab9adbe7350bd6058678bd396dc8c65a91217 [formerly 463f7c5d9b] Former-commit-id: 5faf3a22bd	2012-12-16 20:37:21 -06:00
Bryan Kowal	1b76ff6159	Issue #1262: ... - We will now be building a 64-bit version of the awips2-notification rpm - Updated qpid-devel in nativeLib to match the version of qpid we are using - Added 64-bit libraries to thrift and qpid in nativeLib - The notification executables are now built from source out of nativeLib Former-commit-id: 2f31d21ac3 [formerly c3da463f39] [formerly a210f08acc] [formerly 2f31d21ac3 [formerly c3da463f39] [formerly a210f08acc] [formerly 0970259114 [formerly a210f08acc [formerly 3205e61aaeba7ec7bccb0a4bd2ed8a6e83a77951]]]] Former-commit-id: 0970259114 Former-commit-id: 333e7ab7d4 [formerly bad53d1b7f] [formerly 9daf66759db7f15cffd920e394ee9cbc9ce0ff8c [formerly 9490652103]] Former-commit-id: d1930ad031c0d2a89cee21d8471ec1e59e0c331d [formerly 83e1f8cc0a] Former-commit-id: 95a0a4664f	2012-12-13 12:40:31 -06:00
Roger Ferrel	12125839a8	Issue #1411 Change suggest by Dale Morris for pqact.conf.template. ... Change-Id: I9101cb4eab47a82f64212f457d7e0eea11479cc4 Former-commit-id: 4dfc153172 [formerly 6929a73900] [formerly b677a5ba3d] [formerly 4dfc153172 [formerly 6929a73900] [formerly b677a5ba3d] [formerly aefa650cda [formerly b677a5ba3d [formerly b406c990607a06678a58e36118edcddaab073b26]]]] Former-commit-id: aefa650cda Former-commit-id: 5cd4fc444b [formerly 662d51cda1] [formerly c67e79c92750b1d329293564dce947f07a6fc957 [formerly f64a99d554]] Former-commit-id: bd11629d0caa101f9e8234bc9c9d26e830276ae6 [formerly d7a28eedfd] Former-commit-id: 42c5a7b343	2012-12-11 15:43:54 -06:00
Steve Harris	179755f156	Merge branch 'ss_builds' (12.12.1-12) into development ... Conflicts: cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java Former-commit-id: d27c5237c3 [formerly 4d4771ee3a] [formerly 43ddfe98c4] [formerly d27c5237c3 [formerly 4d4771ee3a] [formerly 43ddfe98c4] [formerly f6988eefff [formerly 43ddfe98c4 [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]]] Former-commit-id: f6988eefff Former-commit-id: 377804398b [formerly f02c1ef71d] [formerly e2ccbce82667d7cf9a91d423288dfe898f82ff00 [formerly 6287b32e7d]] Former-commit-id: 6cdb793c9cb97ebc00900dfc9ab29e81bccdb479 [formerly ebcc9975c4] Former-commit-id: b0a60923c4	2012-12-11 08:45:53 -06:00
Steve Harris	cedbde75e3	12.12.1-12 baseline ... Former-commit-id: 8b74846a1b [formerly 89def5cf03] [formerly e8e41630e8] [formerly 8b74846a1b [formerly 89def5cf03] [formerly e8e41630e8] [formerly 6d610f8e8a [formerly e8e41630e8 [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]]] Former-commit-id: 6d610f8e8a Former-commit-id: 79b0e973ef [formerly 69ab975fab] [formerly 033c9cde2068548258f7d65e7f805b1255162c44 [formerly 7bb37caa23]] Former-commit-id: 54c80ccffc60d6ee8a544b475ed12355b32a2f26 [formerly 190378beeb] Former-commit-id: f8a9ae24cb	2012-12-06 09:18:28 -06:00
Steve Harris	5f22640e99	12.12.1-8 baseline ... Former-commit-id: 8790caf84e [formerly 2d338b4cec] [formerly 19962f41ba] [formerly 8790caf84e [formerly 2d338b4cec] [formerly 19962f41ba] [formerly 5093a7c442 [formerly 19962f41ba [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]]] Former-commit-id: 5093a7c442 Former-commit-id: a45a7fe1bf [formerly ff4131c2ee] [formerly 8bc76fd17f954171eeb656097e29d253329915de [formerly ee06a94735]] Former-commit-id: d1f389a14d75a14807b83f7528cff619dda45f17 [formerly ec2cdc1593] Former-commit-id: 0b22b3c014	2012-12-06 09:02:51 -06:00
Bryan Kowal	675057fb1b	Issue #1392 - update tar directory access paths for awips2-edex-native ... Former-commit-id: 7fd81fb133 [formerly 14555d54d8] [formerly 73e0f4b278] [formerly 7fd81fb133 [formerly 14555d54d8] [formerly 73e0f4b278] [formerly 6ff82d812e [formerly 73e0f4b278 [formerly 65d91d9235a76c5ee82450d3dd6332f92e29c326]]]] Former-commit-id: 6ff82d812e Former-commit-id: 904637f0a3 [formerly d7ce3f5840] [formerly 2f6a9a4156b04d3607ba4a68ec03f068751ba84b [formerly 43f888ccb8]] Former-commit-id: ce02228a17168556242339f9dbbf563e1e3f26cf [formerly ced865ade3] Former-commit-id: 1e1e937a0f	2012-12-05 10:15:37 -06:00
Bryan Kowal	ecaf5b86dd	Issue #1354 - the Linux CAVE thinclient and the MSFT Windows CAVE thinclient will now <b>always</b> include the same CAVE features ... Change-Id: Ib0f1a90fc55293cff2d43d236bec93001d93e8bf Former-commit-id: 8fe14a9a60 [formerly 3a4ca9582d] [formerly d3b455c955] [formerly 8fe14a9a60 [formerly 3a4ca9582d] [formerly d3b455c955] [formerly f99d351995 [formerly d3b455c955 [formerly ca0b97b8d8db19900107ab38f6a6af8a9ee7b935]]]] Former-commit-id: f99d351995 Former-commit-id: 7c25f7a517 [formerly ae64e9ce3b] [formerly e09ce067241433822f5df68635984933d876ecc4 [formerly b0c65323b6]] Former-commit-id: 1c92174acee3e52589c731c91b5fe228e8000580 [formerly 774d3a8f8d] Former-commit-id: 49f45e1901	2012-11-28 16:30:10 -06:00
Bryan Kowal	5bfa0e2fa6	Issue #1318 - updated ncep database rpm specification file ... Change-Id: Ie4b5ef9b76ce96e21e68f40ffc194cb584a1e832 Former-commit-id: b1b627e2c2 [formerly cbef9ad78d] [formerly b60dda550c] [formerly b1b627e2c2 [formerly cbef9ad78d] [formerly b60dda550c] [formerly fe9dcaa216 [formerly b60dda550c [formerly b3f1b857e5a8efcfea0f5b8985eddd5992724d89]]]] Former-commit-id: fe9dcaa216 Former-commit-id: ddfb4e506c [formerly fe9a06b9b9] [formerly 4eb2cd0ee8e37a25a3f86d7e56bcd8d29436927f [formerly 67c3c140e3]] Former-commit-id: 1c4ca1368fb5c9c53a3eb503750a47e8f5f5723b [formerly dbe78374bc] Former-commit-id: 5ef1e97bdd	2012-11-15 10:24:38 -06:00
Bryan Kowal	cd923219f5	Issue #1318 - updated ncep database rpm specification file ... Change-Id: Iac80537a3fcc7998f93d5a3db9e842d7eea141d9 Former-commit-id: fec5563e49 [formerly 12667f6180] [formerly 99399e880e] [formerly fec5563e49 [formerly 12667f6180] [formerly 99399e880e] [formerly 24074da383 [formerly 99399e880e [formerly f433daa8ffe59da91acba71ac5893d77ad810404]]]] Former-commit-id: 24074da383 Former-commit-id: 43764917d6 [formerly 1842deff13] [formerly 6bb70694850931d2fdd0600e6b049709acb20cc6 [formerly 3d123e08a7]] Former-commit-id: 3579179ad997856f31ae2cabd9252b3c0ef11cfa [formerly 954534e3d0] Former-commit-id: 632e800a7e	2012-11-15 09:26:46 -06:00
Dustin Johnson	c6dbe1bc0c	Merge branch 'ss_builds' (12.12.1-4) into development ... Conflicts: ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/SymbolSetElement.java Change-Id: I377f89aa76f5bdb6004f8c63b7d54209e1722a71 Former-commit-id: 069c8d4788 [formerly d27bce13c2] [formerly bff32bbe58] [formerly 069c8d4788 [formerly d27bce13c2] [formerly bff32bbe58] [formerly 0d1d663f41 [formerly bff32bbe58 [formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]]]] Former-commit-id: 0d1d663f41 Former-commit-id: 08fd67e94a [formerly 5d5dbe27e1] [formerly 96aa1003fe8c19de9bb5ccd77ca2429b1e310a1c [formerly e25b7c312b]] Former-commit-id: bcac2231856130f2c05f39f9472f65a6c8313dca [formerly ff33643234] Former-commit-id: 6d21c445c2	2012-11-14 14:41:57 -06:00
Steve Harris	ccb16b9b44	12.12.1-4 baseline ... Former-commit-id: b968ab5135 [formerly b91b7f0fae] [formerly 85130eb611] [formerly b968ab5135 [formerly b91b7f0fae] [formerly 85130eb611] [formerly 57578da521 [formerly 85130eb611 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]]] Former-commit-id: 57578da521 Former-commit-id: 4300583fc2 [formerly e35a321a8c] [formerly 91397e4ab74890ddf2ddf5f2f930941cbb021f93 [formerly 628ca9e5c6]] Former-commit-id: 83b699079d09b1ae989d5d92097f6ebe23a8c242 [formerly 493f335c0b] Former-commit-id: 2c2bfc949d	2012-11-14 14:19:20 -06:00
Steve Harris	b5fd6ed2fd	Merge branch 'ss_builds' (12.12.1-3) into development ... Former-commit-id: 1ee8938748 [formerly 8fc896f7d4] [formerly 448dd1c35f] [formerly 1ee8938748 [formerly 8fc896f7d4] [formerly 448dd1c35f] [formerly 00f3d51546 [formerly 448dd1c35f [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]]] Former-commit-id: 00f3d51546 Former-commit-id: 98670f1cc2 [formerly 21ecd53719] [formerly 2de30d78d62b41d67562abff25e91b45ac8ab8fc [formerly c8cac52915]] Former-commit-id: 02f982c590df771367e3d55fa354bfe951bed8de [formerly 59efd9a217] Former-commit-id: ae9d9985cd	2012-11-13 17:28:50 -06:00
Steve Harris	9e4dbe2640	12.12.1-2 baseline ... Former-commit-id: 7192b19284 [formerly ed809a02db] [formerly a8560580f8] [formerly 7192b19284 [formerly ed809a02db] [formerly a8560580f8] [formerly 6868eb9b23 [formerly a8560580f8 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]]] Former-commit-id: 6868eb9b23 Former-commit-id: 5365b72401 [formerly 111e7607cf] [formerly 454cf3b19a973251055686ba6bcf2017dd870e1d [formerly df89fe9bed]] Former-commit-id: 0a26a9f757bec6107dd0eb5024ce9aaf5d84b865 [formerly 96a4a4f3f5] Former-commit-id: 53d74c66e7	2012-11-13 17:14:24 -06:00
Steve Harris	94cd5a1388	12.12.1-1 baseline ... Former-commit-id: 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly 8278cac143 [formerly c2839cc86d] [formerly e4bd20a515] [formerly e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]] Former-commit-id: e1498006c7 Former-commit-id: 3cb24c1d06 [formerly 4f243de928] [formerly cc5d9cd9866ef60af47606a02772dd35474145e9 [formerly 214fcd3b63]] Former-commit-id: 5b863edab7014aa1117ea6831f473bf942ace0fe [formerly a5be98d6de] Former-commit-id: af59663a99	2012-11-07 12:41:20 -06:00
Dustin Johnson	4bc4d95b21	Issue #1302 Merge branch '5-Data_Delivery' into development ... Conflicts: edexOsgi/build.edex/deploy-common/external-rules.xml edexOsgi/build.edex/deploy-common/plugin-methods.xml edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java edexOsgi/build.edex/build.xml edexOsgi/build.edex/esb/conf/modes.xml edexOsgi/com.raytheon.edex.feature.uframe/feature.xml edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0 Former-commit-id: 7d0e4a6e75 [formerly 8e69107b5a] [formerly 98d7beae50] [formerly 7d0e4a6e75 [formerly 8e69107b5a] [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]] Former-commit-id: 31d7d09c10 Former-commit-id: fe8a2a3b09 [formerly e7a0f96a9a] [formerly 465044dd2793505eba62cb46e6b3a8ac48623765 [formerly bcf575966b]] Former-commit-id: df421cc2225941d22d1932b1c7a86fb3bdad68ce [formerly 4d9c945388] Former-commit-id: 931d94d1de	2012-11-01 13:36:06 -05:00
Steve Harris	ad39c3d8d3	Merge branch 'ss_builds' into development ... Former-commit-id: eb8a05a414 [formerly 340ce53e22] [formerly fb46bb053d] [formerly eb8a05a414 [formerly 340ce53e22] [formerly fb46bb053d] [formerly afb534db67 [formerly fb46bb053d [formerly 791639aecd4c192b4bb8d8bb692f2c696cde1daa]]]] Former-commit-id: afb534db67 Former-commit-id: 0084fee62b [formerly e211bfc043] [formerly cd588b3fe1018ebb8f94ece1f068009b87ded0d7 [formerly 048c0c88cd]] Former-commit-id: 060fac4997aa95b57f239a92d69716b988340174 [formerly e9e3bdbec2] Former-commit-id: 6f16b46b8d	2012-10-29 12:17:12 -05:00
Steve Harris	6c48aaeda6	12.11.1-12 baseline ... Former-commit-id: 7f6baf2e24 [formerly 565756567f] [formerly 8682e4f6ca] [formerly 7f6baf2e24 [formerly 565756567f] [formerly 8682e4f6ca] [formerly 9ff9cb8aa3 [formerly 8682e4f6ca [formerly 14a4f6c31948361ff83aa64d6eaca3d958fd1d8f]]]] Former-commit-id: 9ff9cb8aa3 Former-commit-id: 89940e8fed [formerly d8b6157aab] [formerly 1acfe145013f9afdd8c598af509871593462a766 [formerly 314c03e7b6]] Former-commit-id: 46aec701f4c85f6b083e2354a854e34621b6523a [formerly 09f6e43195] Former-commit-id: a9e1b01ad7	2012-10-29 12:15:56 -05:00
Steve Harris	c9d609908b	Merge branch 'ss_builds' (12.11.1-7) into development ... Former-commit-id: 3a9c6123d2 [formerly d42e8373c6] [formerly b7406a55cc] [formerly 3a9c6123d2 [formerly d42e8373c6] [formerly b7406a55cc] [formerly 38b9c03f5e [formerly b7406a55cc [formerly 92fcd9f3f15f3bbd49934ea04e4fb6e02c4b8684]]]] Former-commit-id: 38b9c03f5e Former-commit-id: 40de07be3a [formerly ae9c6d58dd] [formerly 5b5bfa0479777257e48138e367f1e8be151aea45 [formerly 9d038186d1]] Former-commit-id: 23f93aad7e7b5f4ad6f26010d34ff9b005810c7e [formerly 20e87549c0] Former-commit-id: 8d94eb1e59	2012-10-23 16:43:09 -05:00
Steve Harris	056baad808	12.11.1-7 baseline ... Former-commit-id: 59e5b55b96 [formerly 40a5bc1683] [formerly d8ca6b9005] [formerly 59e5b55b96 [formerly 40a5bc1683] [formerly d8ca6b9005] [formerly 79a5638de9 [formerly d8ca6b9005 [formerly 59b9a93267bcf7b82fdefc55784289f7510117d0]]]] Former-commit-id: 79a5638de9 Former-commit-id: 320a29466d [formerly efba080b9c] [formerly 901f56658eaeddda857d877834f967b14c2f861c [formerly cfd228f0d7]] Former-commit-id: c0d6c794fa054693cb0037318fdbd31ace4531a3 [formerly 572085c119] Former-commit-id: 26badd258f	2012-10-23 16:40:50 -05:00
Steve Harris	5cd4d01a55	Merge branch 'ss_builds' (12.11.1-6) into development ... Conflicts: cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java Former-commit-id: 95727755c7 [formerly 3eff876edd] [formerly a7337d9160] [formerly 95727755c7 [formerly 3eff876edd] [formerly a7337d9160] [formerly 1807100932 [formerly a7337d9160 [formerly de600d1a0e309ddbb4838526a9f92af05282cd1a]]]] Former-commit-id: 1807100932 Former-commit-id: 81db247276 [formerly 8486da2fd3] [formerly a722324705ed3164c37a327413de2e52d14ffae3 [formerly 892e4df811]] Former-commit-id: 2c3f7e188dd7eb8262650be538cc95ed16f9e7d2 [formerly 8a17564ba3] Former-commit-id: 35c2a8e26f	2012-10-18 16:01:05 -05:00
Steve Harris	2d368b5b0b	12.11.1-6 baseline ... Former-commit-id: 58cd1e90f8 [formerly 30c786a885] [formerly fba4a443a0] [formerly 58cd1e90f8 [formerly 30c786a885] [formerly fba4a443a0] [formerly 5c1f3cdc46 [formerly fba4a443a0 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]]] Former-commit-id: 5c1f3cdc46 Former-commit-id: ae73939b02 [formerly 8beb6fc0b8] [formerly 4bf85ed3f3986d98a009ad57add9c40fe46fa2f2 [formerly 08fc9f6b14]] Former-commit-id: bfbc6b62be31cb07dee1061fd2ffeb9b2a9e932a [formerly 4f27cbb406] Former-commit-id: 9c597c7060	2012-10-18 15:53:01 -05:00
Steve Harris	92be4d5105	12.11.1-5 baseline ... Former-commit-id: bb8fe6e556 [formerly 362d6ffaca] [formerly 03f3f3c36a] [formerly bb8fe6e556 [formerly 362d6ffaca] [formerly 03f3f3c36a] [formerly a0eaf651ff [formerly 03f3f3c36a [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]]] Former-commit-id: a0eaf651ff Former-commit-id: dfdf01de85 [formerly 85ad066b70] [formerly 3d301c8774eee84c53a845367dfdb251b5c0f118 [formerly e31c1e5bba]] Former-commit-id: 90ed5b647bfe3dc11c44294f7a83b7e770575415 [formerly dff8d5de9c] Former-commit-id: 13cdd55545	2012-10-18 15:46:42 -05:00
Richard Peter	893bbca4c6	Merge "Issue #1265 remove pypies gzip handling" into development ... Former-commit-id: d0f2925f45 [formerly 935ddb3224] [formerly 3723250e50] [formerly d0f2925f45 [formerly 935ddb3224] [formerly 3723250e50] [formerly cd9306a537 [formerly 3723250e50 [formerly fd47306a1247721d53b227bf94cc94818b4efc39]]]] Former-commit-id: cd9306a537 Former-commit-id: afe520cfaa [formerly aa26b2a623] [formerly 35e5f6584a432fb89498c0f0d47d57ccd6381cb1 [formerly c7894c5cda]] Former-commit-id: 282267bb1e0cd419ae2bdfbc138ffd158e6bbbca [formerly 88b80f406d] Former-commit-id: 1f5b91885d	2012-10-17 14:07:28 -05:00
Nate Jensen	c183bb716f	Issue #1265 remove pypies gzip handling ... Change-Id: Ia79c1b7b2440849893bacf5cd8290fb5627ed4e5 Former-commit-id: 4fc0bee363 [formerly 7874be59e7] [formerly fa3e87549a] [formerly 4fc0bee363 [formerly 7874be59e7] [formerly fa3e87549a] [formerly 2dac2f5dde [formerly fa3e87549a [formerly 6bb4d39b266bedbecff6ecda95bf05e65aa1e58c]]]] Former-commit-id: 2dac2f5dde Former-commit-id: 5262954e46 [formerly 9dac98930f] [formerly c7cef0967a0380bf57d4537db4b1d98a735241df [formerly 740146d838]] Former-commit-id: 03b521636301713132a94fdc9393fa97e47395bc [formerly 60ad3b55f2] Former-commit-id: 853d433117	2012-10-17 11:32:49 -05:00
Steve Harris	01c4fbcf8d	Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development ... Former-commit-id: 37ab3d9e65 [formerly 4ffbffe349] [formerly a63b40b17a] [formerly 37ab3d9e65 [formerly 4ffbffe349] [formerly a63b40b17a] [formerly 5e5c98b193 [formerly a63b40b17a [formerly ecb6a8876078dcff3414ff2a33aa14bf130fa075]]]] Former-commit-id: 5e5c98b193 Former-commit-id: 002e4e0e8b [formerly a3a79a1a82] [formerly 15bce86b4c6e1715fae59229b3f9e7dcc1cf5721 [formerly be16909d2d]] Former-commit-id: 233345bbb54cd1bf39eab6ecf0e32e0f86b0b4e8 [formerly b28a8e5113] Former-commit-id: b7a76beea6	2012-10-16 21:44:49 -05:00
Steve Harris	ec74d87147	Merge branch 'ss_builds' (12.11.1-4) into development ... Conflicts: cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/procedures/IAlterBundleContributor.java cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/AlterBundleDlg.java cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/CoordinateInputPanel.java cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointEditDialog.java cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointsMgrDialog.java cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/layer/PointsToolLayer.java cave/com.raytheon.uf.viz.radarapps.core/src/com/raytheon/uf/viz/radarapps/products/ui/BaseRadarProductUI.java cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ToolsAlterBundleContributor.java cave/com.raytheon.viz.gfe/help/EXAMPLElocalMaps.py cave/com.raytheon.viz.gfe/help/EXAMPLElocalMapsAdd.py cave/com.raytheon.viz.gfe/help/localMapsConfig.html cave/com.raytheon.viz.gfe/help/mapConfig.html cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/Maps.py edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/DbShapeSource.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/ShapeTable.py edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/util/WorldWrapCorrector.java ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java rpms/common/yum/arch.x86/comps.xml Former-commit-id: c19835d4be [formerly da7a11fe97] [formerly 4610ecc513] [formerly c19835d4be [formerly da7a11fe97] [formerly 4610ecc513] [formerly 751563e331 [formerly 4610ecc513 [formerly 07beab271f793ae79fcf9233f9d384702ead22a9]]]] Former-commit-id: 751563e331 Former-commit-id: d88afce365 [formerly d0e91329b4] [formerly 4390735c107d9ebc5c839213d322a92aad724790 [formerly 0c0c1144c6]] Former-commit-id: 188da5301da8f47f50c81e58f02ec2fbae69747e [formerly ad78266035] Former-commit-id: 1e4c737ff2	2012-10-16 15:48:14 -05:00
Steve Harris	8794e3b599	12.11.1-4 baseline ... Former-commit-id: 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]] Former-commit-id: 6958b861f0 Former-commit-id: c9b563338a [formerly 2c82d9cb07] [formerly d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce]] Former-commit-id: 892afd7b093bec93e8f4c170f6b8ae08bea40239 [formerly 560f0d9cc3] Former-commit-id: 35e34308c5	2012-10-16 13:27:07 -05:00
Greg Armendariz	0b4cfdbc47	Merge changes Ibe8b9a97,If48f637e into development ... * changes: Issue #1252 - Checked in wrong file. Deleting it. Change-Id: Ibe8b9a9708e37f7e697e7133b98d24a0060ebd37 Issue #1252 - Updated with changes from Dale Morris Former-commit-id: 24cfef1397 [formerly 2d18d5791a] [formerly d1772b3705] [formerly 24cfef1397 [formerly 2d18d5791a] [formerly d1772b3705] [formerly b8de817d68 [formerly d1772b3705 [formerly ab6631a9b47cb5bc6716bc3ba9805bd40665f785]]]] Former-commit-id: b8de817d68 Former-commit-id: 6e831af9c3 [formerly 1c5bebe6a9] [formerly aeeec4969cf01c7fd65d843c6e49aac72bc82c8b [formerly 2c058c6b8a]] Former-commit-id: 0ba207f813a67dba65ffbc733e6e9160d7a4a27e [formerly 041b833d53] Former-commit-id: 1b318ab0f6	2012-10-16 12:59:00 -05:00
Nate Jensen	b625256d61	Issue #1265 Enable configuration of compression on all current HttpClient traffic, but disabled by default ... Change-Id: If87b57083015bcb4df0d8d302121fd3b981b1eae Former-commit-id: 134d8a2e3b [formerly cbc2da0c06] [formerly f2cbf0c5c3] [formerly 134d8a2e3b [formerly cbc2da0c06] [formerly f2cbf0c5c3] [formerly 8e4a7ec406 [formerly f2cbf0c5c3 [formerly 6d20dbb01981135ea49e1a883c3ba307bdcd8ff1]]]] Former-commit-id: 8e4a7ec406 Former-commit-id: 446d7f5f13 [formerly 93143bbda0] [formerly c35558c0281157096518a8d9e3647aa801d78a21 [formerly 5bdf9d4d38]] Former-commit-id: 39c9b14c28231eba502ff6ceadb2e1e6bddcb180 [formerly 319c4cda2b] Former-commit-id: 1efcd36987	2012-10-12 15:16:27 -05:00
James Korman	7357dd4b31	Issue #1252 - Checked in wrong file. Deleting it. ... Change-Id: Ibe8b9a9708e37f7e697e7133b98d24a0060ebd37 Former-commit-id: 3ce7b04eab [formerly c2a4c48f5d] [formerly aca18f0a37] [formerly 3ce7b04eab [formerly c2a4c48f5d] [formerly aca18f0a37] [formerly fd783767b2 [formerly aca18f0a37 [formerly a9e332dd585910aa6094d30c3e883451fb0df237]]]] Former-commit-id: fd783767b2 Former-commit-id: 24267b6661 [formerly 83bd2e28c4] [formerly 2f58ca4e29b7cc53c712e241e9b070c4f6a99bf1 [formerly 31be9c204d]] Former-commit-id: 89d6fe668f3bb8e7aaa23b4f2ccae73244af8bb7 [formerly 5659c72222] Former-commit-id: 8074a49529	2012-10-12 14:48:59 -05:00
James Korman	ec6b04b0c5	Issue #1252 - Updated with changes from Dale Morris ... Former-commit-id: 8d71a3dc92 [formerly 6d5df727e5] [formerly 2fad414d6d] [formerly 8d71a3dc92 [formerly 6d5df727e5] [formerly 2fad414d6d] [formerly 20c61590a4 [formerly 2fad414d6d [formerly f48f637e60f7537da42681dc001332257a046d2b]]]] Former-commit-id: 20c61590a4 Former-commit-id: ee79b6830c [formerly b306b6bd0a] [formerly cb2d57100027ea4633da455b3e456d1969e40798 [formerly 4ce298e736]] Former-commit-id: c103fd88c5913dd8c694274f02ebedbcd00ff640 [formerly add08a1c0d] Former-commit-id: e41cb57aac	2012-10-12 14:48:59 -05:00
Steve Harris	92a6b72092	Merge branch 'ss_builds' (12.11.1-2) into development ... Change-Id: I4d3416f5f91d7955dd8eb274cd536563862e2b73 Former-commit-id: a6c3e16c69 [formerly 7be572b27d] [formerly 8c97afe03b] [formerly a6c3e16c69 [formerly 7be572b27d] [formerly 8c97afe03b] [formerly 0895f22690 [formerly 8c97afe03b [formerly 1a255600a5e909dc4189e9c88d0735157a400a1d]]]] Former-commit-id: 0895f22690 Former-commit-id: d6f07f7013 [formerly 48a80a23e4] [formerly 0ccc977e5162ad8a17c1a30f58a15fa4f27ad13b [formerly 8dae024430]] Former-commit-id: c55ffde48719b1c578dec26d2fc1779c951daf3e [formerly 8c81601905] Former-commit-id: 198eca2a6c	2012-10-08 13:29:34 -05:00