Steve Harris
8b578c10dc
Merge branch '13.2.1_delivery' into development
...
Former-commit-id: cf384edfbb
[formerly 11b9bfc187
] [formerly 1af055a04b
[formerly 920b282de84def082dac82832d80e67f7bff2b19]]
Former-commit-id: 1af055a04b
Former-commit-id: 29b9077291
2013-01-22 16:45:48 -06:00
Lee Venable
bc10a17c9f
Merge "Issue #1484 - Fix for half timestep changes for 3 hours or less duration. Peer Review comments." into 13.2.1_delivery
...
Former-commit-id: aecd00423a
[formerly 619349b140
] [formerly b945ce9e6e
[formerly ef3d4c5b19c6482ec2ac2d38f90d975b7df1e295]]
Former-commit-id: b945ce9e6e
Former-commit-id: 511a7d9753
2013-01-22 16:26:48 -06:00
Mike Duff
0ffc71147e
Issue #1484 - Fix for half timestep changes for 3 hours or less duration.
...
Peer Review comments.
Change-Id: Ia96c8857094ad14cf0db89b7642dfd46f333ec47
Former-commit-id: e5e7bc1047
[formerly fc4a6264f6
] [formerly 96e2192585
[formerly f7d8b074bc95b61e6d6e8dbe47442e944092618f]]
Former-commit-id: 96e2192585
Former-commit-id: d62088cb0c
2013-01-22 14:57:23 -06:00
Ron Anderson
8e575db69c
Issue #1504 GFE: Model data not always appearing automatically without CAVE restart
...
Change-Id: I1e52c111ec50a860a226d85bed6f0ab6dfebed58
Former-commit-id: 74cb9aeb53
[formerly 62671efc2a
] [formerly 20b0761048
[formerly 1fe63a2d5e20226f6124a9ca27b9f6272c49226c]]
Former-commit-id: 20b0761048
Former-commit-id: 44807ba0d5
2013-01-22 14:47:37 -06:00
Dustin Johnson
756080321e
Issue #1441 Create new datadelivery services plugin
...
Add GroupDefinition service.
Update subscriptions to not have a group name when their group is deleted.
Amend:
Rebase to HEAD of 13.2.1.
Change-Id: I817ca1912f76ccf347907ddb12e3f6fd8de7e5aa
Former-commit-id: 3ec05a5a9c
[formerly 557de162b0
] [formerly 15c2c55ff9
[formerly 464b46dd4f4af60dbeb917f65c18c876d712e4ad]]
Former-commit-id: 15c2c55ff9
Former-commit-id: a3c99f86bb
2013-01-22 11:45:18 -06:00
Steve Harris
5b516ebb6f
Merge branch '13.2.1_delivery' into development
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/BaseGfePyController.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureJob.java
Former-commit-id: 340d2009f7
[formerly df9ac3685e
] [formerly 3a772f41cf
[formerly a0bcc2276fb95097cfc10869f0aa1ee48189fc3a]]
Former-commit-id: 3a772f41cf
Former-commit-id: 111d5afb3a
2013-01-22 09:40:50 -06:00
Dustin Johnson
58b3edd7df
Issue #1501 Include subscription on activation/deactivation notification, remove race condition of table update.
...
Change-Id: Ic3f8ff634136a9830cba42befc7f41c2554698aa
Former-commit-id: 94a0cd5733
[formerly 0281da10cc
] [formerly 2eda48aa0d
[formerly dd07cad3e6b2471fc4371471918078498f05d01e]]
Former-commit-id: 2eda48aa0d
Former-commit-id: c7189052e8
2013-01-21 21:24:48 -06:00
Dustin Johnson
8aed30442e
Merge "Issue #1505 Updated the crawler config to ignore rap_f* and locate rap32 datasets." into 13.2.1_delivery
...
Former-commit-id: 04398e0aa4
[formerly c1f03f7d81
] [formerly 350becc94f
[formerly 2b3039f0f55655d484867701b4f28bfae12aece9]]
Former-commit-id: 350becc94f
Former-commit-id: aa85e0c3ca
2013-01-21 12:23:08 -06:00
Nate Jensen
8f93ca0ed3
Merge "Issue #1446 add getLatCoords and getLonCoords to python data access framework" into development
...
Former-commit-id: 0edf7d7c9f
[formerly e0896d8b5d
] [formerly ec1d35251c
[formerly 06dfa2bba6f7d061b43783e9029b164ad208b6fe]]
Former-commit-id: ec1d35251c
Former-commit-id: 2a07d5c89f
2013-01-21 11:55:34 -06:00
Matt Nash
0652c0840d
Issue #1446 add getLatCoords and getLonCoords to python data access framework
...
Change-Id: I292a9b424cadf3033a861d8a0703b2f02946cd4e
Former-commit-id: 34ca95f039
[formerly af22cf8929
] [formerly b84af90fc2
[formerly 30ffd1412f3b193ce1fe2560f2ecf29027e7f619]]
Former-commit-id: b84af90fc2
Former-commit-id: 177d02d01b
2013-01-21 11:51:18 -06:00
Nate Jensen
e0452a81c7
Merge "Issue #1486 : Commit initial implementation of a generic PythonScript controller class based on GFE's AbstractGfePyController, refactor GFE code to use it." into development
...
Former-commit-id: d725a23922
[formerly 36fc48eb53
] [formerly d45d793d36
[formerly 73d470a83799446554b4dd86eb20638c0d5fc48f]]
Former-commit-id: d45d793d36
Former-commit-id: e969a8c438
2013-01-21 11:42:37 -06:00
Dave Hladky
82cd0a1b58
Issue #1513 Updated the way level lookups are created
...
Change-Id: Ie1120707af608910a88c407ca8af8cf19b964555
Former-commit-id: d0ff35051e
[formerly 53ceda6a62
] [formerly cf1c674c2e
[formerly a6b74b9bd1781ca61e364e24f61bb647602fcce6]]
Former-commit-id: cf1c674c2e
Former-commit-id: e497d39d75
2013-01-21 11:19:00 -06:00
Dave Hladky
bd7e8a6968
Issue #1505 Updated the crawler config to ignore rap_f* and locate rap32 datasets.
...
Change-Id: I6035ad79a31f9ada9910d599d6529ca91ff03173
Former-commit-id: 1c39b88ba4
[formerly 786afee256
] [formerly 5d8851b214
[formerly 07d90ad640806abd237fb13e1476adc1fb8d35c0]]
Former-commit-id: 5d8851b214
Former-commit-id: c45822f09b
2013-01-21 08:29:29 -06:00
Richard Peter
d421b7208a
Merge "Issue #1495 add ensemble selection tab to subset dialog Change-Id: I71c599428285c9d394529a77359a4ba61dd88f15" into 13.2.1_delivery
...
Former-commit-id: ac3b484474
[formerly 76f9e42fd3
] [formerly 9feb73c161
[formerly 4eb1e71df46c7ceaa5bf523c02821228da42460e]]
Former-commit-id: 9feb73c161
Former-commit-id: 5acc5996d3
2013-01-18 15:43:16 -06:00
Ben Steffensmeier
0ec9848c96
Issue #1495 add ensemble selection tab to subset dialog
...
Change-Id: I71c599428285c9d394529a77359a4ba61dd88f15
Former-commit-id: d06ef00715
[formerly f0d1c1a737
] [formerly 14f3c3b3bf
[formerly e884c8e79f05af8fb3252fa7a492d232ba090715]]
Former-commit-id: 14f3c3b3bf
Former-commit-id: a28d09edbf
2013-01-18 15:42:08 -06:00
Richard Peter
0f208693ec
Merge "Issue #1495 enable ensemble subset requests in opendap. Change-Id: I5c74b23f6c5c31b397855f102ee08f9c5737ac1a" into 13.2.1_delivery
...
Former-commit-id: 7cc497c663
[formerly 9f9020db61
] [formerly bf18ba9214
[formerly b940fe556d1421d3709ff6c798ee0a39ae09af10]]
Former-commit-id: bf18ba9214
Former-commit-id: 2e5883c56e
2013-01-18 15:35:56 -06:00
Ben Steffensmeier
41a0a0e4e4
Issue #1495 enable ensemble subset requests in opendap.
...
Change-Id: I5c74b23f6c5c31b397855f102ee08f9c5737ac1a
Former-commit-id: 928cb3b00f
[formerly eb821d7580
] [formerly 94ba8511cb
[formerly ddaf9e6c69221600deedfbaf991a3936d0bb711e]]
Former-commit-id: 94ba8511cb
Former-commit-id: 7e3b6d12f6
2013-01-18 14:58:10 -06:00
Greg Armendariz
817162c467
Merge "Issue #1508 : Improve capture to grab screen shots and multiple jstacks to track thread state over time" into 13.2.1_delivery
...
Former-commit-id: edda76ad75
[formerly 9d06f6ed6d
] [formerly f7b046fa0d
[formerly 0356abb43bea7c9bcf7fcfc9c43d46a2fa611389]]
Former-commit-id: f7b046fa0d
Former-commit-id: dda78c073a
2013-01-18 14:30:12 -06:00
Richard Peter
ee9adb9764
Issue #1508 : Improve capture to grab screen shots and multiple jstacks to track thread state over time
...
Change-Id: I2d41e348d1cd4187887ec47c18f3b6d768ced8fd
Former-commit-id: b83e46a345
[formerly a1c58ab36d
] [formerly af105bfe0f
[formerly 8c232b02fbdd268f19e65676d68311b47469fcf3]]
Former-commit-id: af105bfe0f
Former-commit-id: f5c8534098
2013-01-18 13:55:56 -06:00
Steve Harris
0ca985778e
Merge branch '13.2.1_delivery' into development
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/MpeLightningSrv.java
Former-commit-id: 89f3120c0c
[formerly 2c9c6b7dde
] [formerly 407d73a04f
[formerly cda6b1137d9052b0859f2b51f5bdadecad411e43]]
Former-commit-id: 407d73a04f
Former-commit-id: bbb637faf3
2013-01-18 10:52:29 -06:00
Nate Jensen
cc0725f0b7
Issue #1497 fix build
...
Former-commit-id: 13b5619297
[formerly 6e0f0d330e
] [formerly b52aa82213
[formerly 3b30fcffe24d19c6c694d9519d1a515843248d32]]
Former-commit-id: b52aa82213
Former-commit-id: 98ec6fcc1c
2013-01-17 18:42:38 -06:00
David Gillingham
09836dacca
Issue #1486 : Commit initial implementation of a generic PythonScript controller class based on GFE's AbstractGfePyController, refactor GFE code to use it.
...
Change-Id: I6d04b58fea98c6e4ef032b4867969b8a01e258bc
Former-commit-id: 9e3999a427
[formerly c6e64d83a2
] [formerly d16760c73e
[formerly f54f775fa2bb89663e308feb79f5e188dbdd4cb4]]
Former-commit-id: d16760c73e
Former-commit-id: a40383de3b
2013-01-17 17:42:05 -06:00
Richard Peter
a41c4056af
Merge "Issue #1501 Use registry version of subscription when sending notification responses" into 13.2.1_delivery
...
Former-commit-id: f553d99665
[formerly 08e7ce3da9
] [formerly f2ed67c841
[formerly 05dde10fa4bab4b93f7a2f25c368a2a99acae581]]
Former-commit-id: f2ed67c841
Former-commit-id: 683fdaf376
2013-01-17 17:06:52 -06:00
Nate Jensen
492634b6f5
Issue #1497 ported python fillEditArea to Java to boost speed
...
Change-Id: Idbc2a027914e1a584d36551781df21ed9bf63c36
Former-commit-id: 449b3735f0
[formerly 278ea6d24e
] [formerly 15e1731ef3
[formerly 32cf1236638c64a3e047398ca829d79d3b7cb5ef]]
Former-commit-id: 15e1731ef3
Former-commit-id: f70f8d1f4f
2013-01-17 16:14:56 -06:00
Dustin Johnson
9681f57fac
Issue #1501 Use registry version of subscription when sending notification responses
...
Change-Id: I96622e8f1d2236ade47d4c5a11ad41b750bc7962
Former-commit-id: 9f775d2dd7
[formerly d9064bdc98
] [formerly 38036a0e8b
[formerly da8f6de9ae2b897163b465c045114fbd9ebec6e8]]
Former-commit-id: 38036a0e8b
Former-commit-id: 13a75fabad
2013-01-17 14:53:36 -06:00
Dustin Johnson
fce3f8bec9
Issue #1412 Check file last modified times each time role data is requested
...
Change-Id: Ieae84ad3106e3aa0cf4d253a10c27e8c9c60ecaa
Former-commit-id: b1ce19e41d
[formerly 74d5a70c30
] [formerly 037dabb683
[formerly b7e577237df9e157fdb218af48c41f6209ff2bfb]]
Former-commit-id: 037dabb683
Former-commit-id: 6468029207
2013-01-17 12:48:01 -06:00
Nate Jensen
55a2d4bab5
Merge "Issue #1491 add Geometry converter and move registry spring instantiation" into development
...
Former-commit-id: 5e585f8bcd
[formerly 5b8cbca329
] [formerly 358e5f7ef9
[formerly c19effd855522fc5eafe7be02f845162a5bff2bb]]
Former-commit-id: 358e5f7ef9
Former-commit-id: b591570bc6
2013-01-17 09:28:16 -06:00
Nate Jensen
aacdfed4a3
Merge "Issue #1481 slight clean up of radar, make alphanumeric values empty for any products that do not matter" into 13.2.1_delivery
...
Former-commit-id: 40ebb52178
[formerly cd45e662fd
] [formerly 391a179bdb
[formerly 3824077f84deb52ee2d7adc7b19f5134e6788ddb]]
Former-commit-id: 391a179bdb
Former-commit-id: 8ee59505b6
2013-01-17 09:27:52 -06:00
Roger Ferrel
86d51634dc
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: 972db12324
[formerly 1cd076671c
] [formerly 1e492b81ff
[formerly 7f70c2f65453db6bf3097ae8157511c38a36b136]]
Former-commit-id: 1e492b81ff
Former-commit-id: f10521f861
2013-01-16 16:53:29 -06:00
Brad Gonzales
a90db41abd
Issue #1448 Added app context checks to ArealQpeGenSrv MpeLightningSrv. Uncommented run_report_alarm call in run_alarm_whfs. Moved internal methods to private in MpeRUCFreezingLevel.
...
Amend: removed log statments from run_alarm_whfs based on review comments.
removed tab.
Change-Id: I05cd853814376bfb0ac61e3340210be928a35c57
Former-commit-id: 1a3e279226
[formerly 31c48be1c5
] [formerly 69eccc1d80
[formerly 86c094b2d301dbf6ead2d74bc64b3596cf2ef6d8]]
Former-commit-id: 69eccc1d80
Former-commit-id: e1e5001736
2013-01-16 15:23:53 -06:00
Richard Peter
15115e1ac0
Merge "Issue #1420 - More Rules changes. Peer review comments" into 13.2.1_delivery
...
Former-commit-id: 6bc65147b3
[formerly f6749331c9
] [formerly 86acbf5470
[formerly fc818294ba14c7b957cf6aedae153d3a18b5219b]]
Former-commit-id: 86acbf5470
Former-commit-id: 8d72673d7a
2013-01-16 15:08:37 -06:00
Mike Duff
72a70a6eaf
Issue #1420 - More Rules changes.
...
Peer review comments
Change-Id: I3ed89b332764bba2d995a248e361d20c1eec6edf
Former-commit-id: 1df1b5a94d
[formerly 2a31447d6d
] [formerly 8d0a79703f
[formerly 84f2d0ed39e11059359558676c988a0bf1e989b9]]
Former-commit-id: 8d0a79703f
Former-commit-id: c6924b6920
2013-01-16 14:34:55 -06:00
Richard Peter
e4651df11e
Merge "Issue #1493 fix grib2 decoder to handle ensembles" into 13.2.1_delivery
...
Former-commit-id: 312b786d02
[formerly 276fee1b70
] [formerly b98ed1f8e7
[formerly 8b0a1178ecd824a3b7f399a187f5c152025aa58e]]
Former-commit-id: b98ed1f8e7
Former-commit-id: 6d3159ea80
2013-01-16 12:41:32 -06:00
Dustin Johnson
ecb1d5564a
Issue #1487 Use XML to store stats grouping information in the database
...
Amend:
Increase length of grouping column to 1024.
Add deltaScript to convert the grouping column to xml.
Change regex to replace any pluginName fields with dashes, not just satellite-mcidas.
Change-Id: I0d5081645c5f11909e5778c8e555d5da3cf77e1a
Former-commit-id: c12b46027f
[formerly b627dfc054
] [formerly 19d3a14d4f
[formerly 38ecb1f36dce4717d0ba9066c8cd22116770d34b]]
Former-commit-id: 19d3a14d4f
Former-commit-id: c750e27389
2013-01-16 12:21:11 -06:00
Steve Harris
b8ab464cee
Merge branch '13.2.1_delivery' into development
...
Former-commit-id: 79e7b50d94
[formerly 8c447659ff
] [formerly 483e55bcef
[formerly 723f0efba18c83c46d3b241dae678e81d2ac924d]]
Former-commit-id: 483e55bcef
Former-commit-id: 2e34a82690
2013-01-16 12:03:50 -06:00
Ben Steffensmeier
e7969ff457
Issue #1493 fix grib2 decoder to handle ensembles
...
Former-commit-id: 02e0433afc
[formerly 7d155653bc
] [formerly 4595797f5f
[formerly c694df943bb70f2903fe495400061444a67d3357]]
Former-commit-id: 4595797f5f
Former-commit-id: fb237583e2
2013-01-15 18:08:19 -06:00
Bryan Kowal
03ccca567a
Issue #1414 - adding Satellite to the Data Access Framework
...
- addressed peer review comments
- includes the CAVE generic grid resource and resource data
- the generic grid resource now utilizes the populateData method of IGridData
- the data time methods of the satellite factory will now throw data retrieval exceptions
Change-Id: I763cddc8ba8cac715eb0605594904bd9f9c21db9
Former-commit-id: a315e4461b
[formerly 4939e96872
] [formerly 789359a779
[formerly b084e4a721edc9400fc7a8f25c7da539d6dd8480]]
Former-commit-id: 789359a779
Former-commit-id: 53a280116b
2013-01-15 18:08:17 -06:00
Matt Nash
2070cc94b0
Issue #1491 add Geometry converter and move registry spring instantiation
...
Change-Id: I7794f41c637b5e29662356d81e172d3484e66a56
Former-commit-id: 5bc585c73c
[formerly 648c027294
] [formerly b4f48078ca
[formerly 94b52c4d617f15bb0bd8d460eb9c5ab6e1a201e6]]
Former-commit-id: b4f48078ca
Former-commit-id: 73ab7a756a
2013-01-15 17:06:28 -06:00
Richard Peter
cb3f43b17a
Merge "Issue #1489 Harvester directories not created causing harvester to not start" into 13.2.1_delivery
...
Former-commit-id: e8a4939150
[formerly 09fb2d0919
] [formerly 0e684515c6
[formerly 8388122d8273aca20a9c4292035049957a091a69]]
Former-commit-id: 0e684515c6
Former-commit-id: 8258395d58
2013-01-15 16:11:35 -06:00
Matt Nash
a78f914b92
Issue #1481 slight clean up of radar, make alphanumeric values empty for any products that do not matter
...
Change-Id: I88847a609e57e8057a480653add74f0c5c5b4934
Former-commit-id: 3f8cf19d71
[formerly 79e95d787c
] [formerly db1dfd3001
[formerly 1ac8a6d7320254f4f69160f764c86e8bd4b35d66]]
Former-commit-id: db1dfd3001
Former-commit-id: 9f8cc4ec5d
2013-01-15 16:05:25 -06:00
Nate Jensen
34c9aa4a6f
Merge "Issue #1446 improve javadoc" into development
...
Former-commit-id: 0831a0252d
[formerly 10f67e664d
] [formerly c78078ee6e
[formerly 186ecd09bb158d77c63be03b556f6b4a648f4191]]
Former-commit-id: c78078ee6e
Former-commit-id: 7cb08e43b8
2013-01-15 15:27:44 -06:00
Nate Jensen
f342a404c6
Issue #1446 improve javadoc
...
Change-Id: I5cd77c5d4e5e75f3b0a364db610c470d163b9307
Former-commit-id: 1bd160b878
[formerly 2450821fe7
] [formerly 8588d94cd7
[formerly 668baa6b031f79d82aff64d98a13cd901ac90222]]
Former-commit-id: 8588d94cd7
Former-commit-id: 3ea6667da1
2013-01-15 15:22:46 -06:00
Bryan Kowal
38480e46b1
Issue #1469 - pypies will now read the hdf5 root directory from configuration. Relative paths can now be passed to pypies. Rebased to fix merge conflict.
...
Change-Id: I38873e478729a3644db7ce2813e9bd6c15d9bdf3
Former-commit-id: fba28ea69b
[formerly e2a12845d3
] [formerly 4db9c6c321
[formerly ed2e78738b391bcb9a40ddde7b7a6acf7ccd1b30]]
Former-commit-id: 4db9c6c321
Former-commit-id: c1330e8121
2013-01-15 14:56:01 -06:00
Max Schenkelberg
fac8769336
Issue #1457 Initial changes for MPE time refactor. Wrote custom resource that handles multiple times and tailored code to use resource instead of old XmrgResource which was not written to support multiple frames
...
Amend: Cleaned up comments and some bugs in code after review
Amend: Rebased changes
Change-Id: I512b9bb30a08b9a1cfc5e8d9b5008ebc4f352c2d
Former-commit-id: e5cd1901a5
[formerly ff72ce0b0c
] [formerly db3e7bab99
[formerly ab74da7808aa343983f532ee076820c7e63fdded]]
Former-commit-id: db3e7bab99
Former-commit-id: c246f56568
2013-01-15 14:41:19 -06:00
Nate Jensen
f726a26b54
Issue #1446 Initial python within Jep implementation of data access framework
...
Change-Id: I7b6ddb25f0ec68419aab7e40f15f94cd16e155b8
Former-commit-id: e5e7107a56
[formerly e5237fceac
] [formerly 12e0a100c4
[formerly 1c5339c02a8570e12f92559a3159006efdf0df77]]
Former-commit-id: 12e0a100c4
Former-commit-id: aaa442212a
2013-01-15 13:48:04 -06:00
Dave Hladky
fa9dc500a3
Issue #1489 Harvester directories not created causing harvester to not start
...
Change-Id: Id5caa14ebc33451f95e5d1e9d685c4094091ff63
Former-commit-id: 34577b50dd
[formerly 9b75eaf869
] [formerly b6bf73134e
[formerly 08b944fa708ba12ac6df63b64501ff20f4738063]]
Former-commit-id: b6bf73134e
Former-commit-id: ccf832dd38
2013-01-15 12:41:15 -06:00
Dustin Johnson
94e95f3e07
Issue #1286 Fix bugs found during 1286 testing
...
Amend:
Add time domain code.
Change-Id: Ib62ea23571a7e80877f8090064a8638e111fd2d2
Former-commit-id: 99f8d40bed
[formerly 3d74a68e94
] [formerly 2cf52d976b
[formerly 9b79cfc11541c737087fb613c686d50cf79e0a7b]]
Former-commit-id: 2cf52d976b
Former-commit-id: aa7acedf0a
2013-01-15 10:18:14 -06:00
Steve Harris
e202452ace
Issue #1408 - Fix syntax errors in server config
...
Former-commit-id: 9a3be4460e
[formerly aee6a65e4c
] [formerly a5eac8ec3c
[formerly 29e1fc44a04dff56747b60d904e49d87cebf4f85]]
Former-commit-id: a5eac8ec3c
Former-commit-id: 31f190865e
2013-01-15 09:47:25 -06:00
Richard Peter
79ef100838
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: a966546e31
[formerly 3fb7d96ec1
] [formerly 1dbb34523b
[formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]
Former-commit-id: 1dbb34523b
Former-commit-id: 345dfd2ca9
2013-01-14 18:07:17 -06:00
Richard Peter
ea7d2eaff1
Merge "Issue #1408 : Merge branch 'ss_builds' (13.1.2-8) into development" into development
...
Former-commit-id: d2cc93281a
[formerly 59368e93e1
] [formerly 4176d078a7
[formerly 931d3e1bba7c747737818f5a2a0c8a8ad9a32c47]]
Former-commit-id: 4176d078a7
Former-commit-id: 2049e40d87
2013-01-14 17:49:29 -06:00