Commit graph

2221 commits

Author SHA1 Message Date
Nate Jensen
0e25d15232 Issue #1562 max's fix for topo with custom colormaps
Change-Id: I7ede37a61d39cdc091c95a7d888af9347ca7621e

Former-commit-id: d64e0a2a39 [formerly 057a929903] [formerly d64e0a2a39 [formerly 057a929903] [formerly 6c711f037c [formerly 88e676506f6dec74514c25260edcc44d9e0564d5]]]
Former-commit-id: 6c711f037c
Former-commit-id: 6ca17c5a2a [formerly 616612e550]
Former-commit-id: fb5bce6afe
2013-04-03 14:10:53 -05:00
Lee Venable
d5a12212d9 Merge "Issue #1731 - fix problem with dmd updating." into omaha_13.3.1
Former-commit-id: 48433d4d37 [formerly 0693b02556] [formerly 48433d4d37 [formerly 0693b02556] [formerly 7bdf9c3115 [formerly 321f2a9f7b8c204937a8685b402b0f90db13f321]]]
Former-commit-id: 7bdf9c3115
Former-commit-id: f254b070eb [formerly ea85582347]
Former-commit-id: 2912d66b16
2013-04-02 17:46:48 -05:00
Mike Duff
aef1bc779f Issue #1731 - fix problem with dmd updating.
Change-Id: I1f3eb576cf26a42195ca9c4cadfbeaeb77394af6

Former-commit-id: c3ab8259d5 [formerly 64cdb3c7fd] [formerly c3ab8259d5 [formerly 64cdb3c7fd] [formerly 23c8085402 [formerly a8c25cfced44c7e3edfd1b37af73b2af8753212b]]]
Former-commit-id: 23c8085402
Former-commit-id: bb14757eed [formerly 3f2f0937ce]
Former-commit-id: 5298fb6633
2013-04-02 16:22:23 -05:00
Greg Armendariz
e389a3bf6a Issue #1782 - Restoring #1813 & #1478
Change-Id: Id4829a147dc265becc13b7da1b01fa5f303db24d

Former-commit-id: f1776b887d [formerly e5408c3807] [formerly f1776b887d [formerly e5408c3807] [formerly 54f56fde29 [formerly e138a6c57a9bc1da5b00eb31dfb1e8ae426f998a]]]
Former-commit-id: 54f56fde29
Former-commit-id: e3cf306ce4 [formerly 02e79dfe8a]
Former-commit-id: 9ca713f588
2013-04-02 15:00:26 -05:00
Steve Harris
e74f4ae39e Merge branch 'master_13.3.1' (13.3.1-17) into omaha_13.3.1
Conflicts:
	rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE

Former-commit-id: 3b722f1076 [formerly 74a47b9bd9] [formerly 3b722f1076 [formerly 74a47b9bd9] [formerly 14c9de2259 [formerly 98ddc22749f0e5cdb0f4f8f0084ee742486461d5]]]
Former-commit-id: 14c9de2259
Former-commit-id: f85a1ab9ab [formerly a6dd28cc82]
Former-commit-id: 0fee31b1a8
2013-04-01 12:15:04 -05:00
Steve Harris
a112803c98 13.3.1-17 baseline
Former-commit-id: f28b85d42f [formerly 7bf9966dcb] [formerly f28b85d42f [formerly 7bf9966dcb] [formerly a3fe998f8f [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]]
Former-commit-id: a3fe998f8f
Former-commit-id: ef413da5f7 [formerly 4afa41d4e7]
Former-commit-id: 50becef97f
2013-04-01 12:04:56 -05:00
Steve Harris
e61c718b49 13.3.1-16 baseline
Former-commit-id: a262f22cee [formerly 51380726d4] [formerly a262f22cee [formerly 51380726d4] [formerly 3066dd33e5 [formerly 18321f88c2efedf141b84e7de18c200e1037f740]]]
Former-commit-id: 3066dd33e5
Former-commit-id: 6b75202d07 [formerly 36a4b3eb51]
Former-commit-id: c53a305b1e
2013-04-01 11:39:08 -05:00
Steve Harris
cc1ef45545 13.3.1-15 baseline
Former-commit-id: 4cf3ad6abb [formerly eb1dab3864] [formerly 4cf3ad6abb [formerly eb1dab3864] [formerly 3d8ed484be [formerly 369cf4feaee63c96725cb6efc5774b8f6b8cbf08]]]
Former-commit-id: 3d8ed484be
Former-commit-id: 2bf790aae3 [formerly d3cec5d3cb]
Former-commit-id: 4204273f21
2013-04-01 11:33:20 -05:00
Ben Steffensmeier
facdfdc501 Issue #1799 fix modal tools again.
Former-commit-id: cffac354e8 [formerly eeeede7288] [formerly cffac354e8 [formerly eeeede7288] [formerly 66af8daa11 [formerly c1a69f88df85478571394c0e125617c93100168d]]]
Former-commit-id: 66af8daa11
Former-commit-id: 11e6afa5fa [formerly 7082466303]
Former-commit-id: b3245f7a5d
2013-03-29 14:30:54 -05:00
Ron Anderson
8502dee456 Issue #1838 Fixed selected time range when Select Grids When Stepping is enabled.
Change-Id: I30417042d568e6471f8a684fab8bcc2387618089

Former-commit-id: 4ac9a4d9a8 [formerly 0f4fb125b0] [formerly 4ac9a4d9a8 [formerly 0f4fb125b0] [formerly c7cfcf0250 [formerly 3a3f0a47ac33d19259cfc447b0abedd9930e2c64]]]
Former-commit-id: c7cfcf0250
Former-commit-id: cd0f319ec5 [formerly 9cfa87f7e5]
Former-commit-id: 41b0758084
2013-03-29 10:48:26 -05:00
Ron Anderson
1eede44aac Issue #1774 Fix invalid unit strings in parameterInfo files.
Change-Id: I681f323b91f213dad5d2ad725bfb77f304e769de

Former-commit-id: cfb324f380 [formerly aeb451a37c] [formerly cfb324f380 [formerly aeb451a37c] [formerly 679bb01764 [formerly 961526d5a895922b07b8358d5b284f7fc9b02566]]]
Former-commit-id: 679bb01764
Former-commit-id: d5e3976dc4 [formerly 96e8f63679]
Former-commit-id: 22f633b2a1
2013-03-29 10:07:37 -05:00
David Gillingham
4c1c4e665e Issue #1837: Provide better error logging when a map referenced in localMaps.py cannot be found in the database.
Change-Id: I2400f46f8010ff312c0943b3d08c89d6ce34c5e0

Former-commit-id: 170f252bdd [formerly 8a7c965eaa] [formerly 170f252bdd [formerly 8a7c965eaa] [formerly c9ed59b0e0 [formerly 8b98836e103e082ccf266e1030b5fd3351095618]]]
Former-commit-id: c9ed59b0e0
Former-commit-id: fddd42615d [formerly dbec0fa00f]
Former-commit-id: 0b155a5788
2013-03-28 17:18:43 -05:00
Nate Jensen
1b1d1a48d2 Merge "Issue #1774 Fix D2D accumulative parameter time ranges" into omaha_13.3.1
Former-commit-id: 3ad797690b [formerly 214b2ed4ba] [formerly 3ad797690b [formerly 214b2ed4ba] [formerly 1bf37125c4 [formerly d14cbd8b4a99316bbbf015e1392a34f63a1082d6]]]
Former-commit-id: 1bf37125c4
Former-commit-id: 946323416c [formerly 711fbe98d2]
Former-commit-id: a6a81a17d6
2013-03-28 17:02:14 -05:00
Ben Steffensmeier
788df8fc68 Issue #1799 fix activation of tools for new perspectives.
Former-commit-id: dcbed65681 [formerly 50a276a7e2] [formerly dcbed65681 [formerly 50a276a7e2] [formerly 4efa92ff49 [formerly a4c1e2f9526efa227b246b8dc4df9cb00566def1]]]
Former-commit-id: 4efa92ff49
Former-commit-id: 33de9bfc87 [formerly a415fb17ae]
Former-commit-id: a5e1593213
2013-03-28 15:47:36 -05:00
Ron Anderson
bef17d4f03 Issue #1774 Fix D2D accumulative parameter time ranges
Change-Id: I57b32881a30e89c999dae6db7753da83f9e949c1

Former-commit-id: 27e07ce4a9 [formerly 5bb47b7931] [formerly 27e07ce4a9 [formerly 5bb47b7931] [formerly b65ecfc151 [formerly aee839a85ec68c7eb80ef1e7236af6cb4666372b]]]
Former-commit-id: b65ecfc151
Former-commit-id: 33bcf5fee8 [formerly 3f2fa771d9]
Former-commit-id: 5eb1885dbd
2013-03-28 13:37:29 -05:00
Steve Harris
938243eb0b Revert "Replaced with formatted version"
This reverts commit 20c9d653c8 [formerly 054d8d263f] [formerly e074710e0a [formerly cf9b267283]] [formerly 18019c07a4] [formerly ff977fc882 [formerly b741680965] [formerly ff977fc882 [formerly b741680965] [formerly 18019c07a4 [formerly d9726bc27ae5387dc5042628b79a9b4239120d08]]]].


Former-commit-id: c51c9ea5df [formerly 29c5918428] [formerly c51c9ea5df [formerly 29c5918428] [formerly 8400028e11 [formerly 1c0d9e2058ce98c5de8e046a35bf2a6954b2e3f3]]]
Former-commit-id: 8400028e11
Former-commit-id: 7bd478fc41 [formerly b614bf53f6]
Former-commit-id: 0074c522bb
2013-03-28 13:08:16 -05:00
Greg Armendariz
20c9d653c8 Replaced with formatted version
Former-commit-id: ff977fc882 [formerly b741680965] [formerly ff977fc882 [formerly b741680965] [formerly 18019c07a4 [formerly d9726bc27ae5387dc5042628b79a9b4239120d08]]]
Former-commit-id: 18019c07a4
Former-commit-id: e074710e0a [formerly cf9b267283]
Former-commit-id: 054d8d263f
2013-03-28 12:59:43 -05:00
Dustin Johnson
a5009cb271 Issue #1840 Fix merge error that removed .classpath
Change-Id: I976e69d04ce47fe31cf47c9aff7de1bed786ad17

Former-commit-id: c2edf1dd89 [formerly ab42673848] [formerly c2edf1dd89 [formerly ab42673848] [formerly a4e4df02b0 [formerly 59977a0a652352a9128caaaf7d8f041b82941490]]]
Former-commit-id: a4e4df02b0
Former-commit-id: 85d6a19a5e [formerly 902986256d]
Former-commit-id: f135c0d948
2013-03-28 12:14:47 -05:00
Greg Armendariz
817f9ec79c Merge "Issue #1832 - re-compile Linux 32-bit and 64-bit versions of jep; recompile MSFT Windows 32-bit version of jep" into omaha_13.3.1
Former-commit-id: b543b515d9 [formerly a48365165b] [formerly b543b515d9 [formerly a48365165b] [formerly 943426fd00 [formerly 6eee456e38bcc5d4a7097868a50e6928cc99bf16]]]
Former-commit-id: 943426fd00
Former-commit-id: 10823802da [formerly 05d1d16500]
Former-commit-id: cccd9a73ca
2013-03-28 12:05:07 -05:00
Bryan Kowal
cb965ceb79 Issue #1832 - re-compile Linux 32-bit and 64-bit versions of jep; recompile MSFT Windows 32-bit version of jep
- add Eclipse CDT configuration for 32-bit and 64-bit Linux compiles


Former-commit-id: 5fe808757f [formerly c592e8a877] [formerly 5fe808757f [formerly c592e8a877] [formerly 955b5c84d3 [formerly 6f51d7079a786534edfa4f60d365284611fb8c3e]]]
Former-commit-id: 955b5c84d3
Former-commit-id: 1a11fef532 [formerly 7a6f32796b]
Former-commit-id: 087e7b2468
2013-03-28 10:42:51 -05:00
Ben Steffensmeier
67b3b92712 Issue #1821 recalculate 6 hours to be longer.
Former-commit-id: 61e0ca3b75 [formerly a9cec71222] [formerly 61e0ca3b75 [formerly a9cec71222] [formerly efbdd3aa8c [formerly 9ffb12e004e0268f6e9f662a10a6b8d7a1b916ed]]]
Former-commit-id: efbdd3aa8c
Former-commit-id: e1a619e030 [formerly 403da9bfb9]
Former-commit-id: 94dcd159d4
2013-03-28 10:16:11 -05:00
Bryan Kowal
c29e1e5374 Issue #1821 - re-compile grib2.so 32-bit and 64-bit
Former-commit-id: 203a3d5200 [formerly da99727625] [formerly 203a3d5200 [formerly da99727625] [formerly 2da2b370db [formerly f7f382d880134acb2f84bef990302aa91784c2d2]]]
Former-commit-id: 2da2b370db
Former-commit-id: 131e260337 [formerly 998fbe8769]
Former-commit-id: 9343dee116
2013-03-28 09:48:27 -05:00
Greg Armendariz
0ab3b9d7f9 Add source variable
Former-commit-id: ae09ebb11f [formerly 8800080d2a] [formerly ae09ebb11f [formerly 8800080d2a] [formerly d0d889f11d [formerly fbd7e7f86b3568a0b04f2b34a072b45a301d8d2d]]]
Former-commit-id: d0d889f11d
Former-commit-id: 44fcd1a8db [formerly 24fea6f45d]
Former-commit-id: 344c5b41b3
2013-03-28 08:56:50 -05:00
Steve Harris
550305a7b6 Merge branch 'master_13.3.1' (13.3.1-14 cleaned up) into omaha_13.3.1
Former-commit-id: c284261dc2 [formerly 3cb15755a8] [formerly c284261dc2 [formerly 3cb15755a8] [formerly 6351d8f6d3 [formerly 0f0b0a0c0f2f0d334ccd56f8265e2b6fd9a12902]]]
Former-commit-id: 6351d8f6d3
Former-commit-id: 3138de0e06 [formerly e56bd830ac]
Former-commit-id: 5102880f6e
2013-03-27 22:13:11 -05:00
Steve Harris
c1c5990b25 13.3.1-14 baseline
Former-commit-id: 6a4bbd9f1a [formerly c29076949e] [formerly 6a4bbd9f1a [formerly c29076949e] [formerly 4d4234d5c9 [formerly e05ab5dbc442d410ae53400f087c02197ba5068b]]]
Former-commit-id: 4d4234d5c9
Former-commit-id: e89cef72a4 [formerly c0737a6022]
Former-commit-id: efadc571ca
2013-03-27 22:10:03 -05:00
Richard Peter
6bca38d68c Merge "Issue #1821 Reduce db and pypies requests in grid assembler." into omaha_13.3.1
Former-commit-id: 642ff5e320 [formerly 3ba331e9f5] [formerly 642ff5e320 [formerly 3ba331e9f5] [formerly 2b207fc6ec [formerly db45bf80d754e49429e4d6a7fd6a28f50d7fb140]]]
Former-commit-id: 2b207fc6ec
Former-commit-id: b061ba5595 [formerly d8cbd1ff39]
Former-commit-id: c2896a01d2
2013-03-27 18:32:38 -05:00
Richard Peter
97a4cd9e1a Merge "Issue #1821 make GridInfoCache more elaborate. Change-Id: Ib64a68ab4e898eba5fe186ac5ac01407964e37d9" into omaha_13.3.1
Former-commit-id: 2a71b9de1b [formerly 7992b43a7a] [formerly 2a71b9de1b [formerly 7992b43a7a] [formerly 6c4f279623 [formerly b0753a969f27d0f7903a42a535066e3ac5b354fd]]]
Former-commit-id: 6c4f279623
Former-commit-id: ce746d6228 [formerly e68173e147]
Former-commit-id: 17a9c008d0
2013-03-27 18:28:01 -05:00
Steve Harris
21332cb0b5 Issue #1782 - Merge branch 'master_13.3.1' (13.3.1-14) into omaha_13.3.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.request/.classpath
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
	rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE

Change-Id: I6b2513155d566aa09571c280b46cf309028a9861

Former-commit-id: 979d6a5d8c [formerly 2a0e399dc8] [formerly 979d6a5d8c [formerly 2a0e399dc8] [formerly d997aeaee4 [formerly 6f42195bd8f6087fb8bb55232082c0ec5f867e12]]]
Former-commit-id: d997aeaee4
Former-commit-id: 428ec8a472 [formerly e67b16bb03]
Former-commit-id: f3a84e952e
2013-03-27 18:21:05 -05:00
Ben Steffensmeier
1f507138d3 Issue #1821 Reduce db and pypies requests in grid assembler.
Former-commit-id: 6171d60f44 [formerly 60d13f2282] [formerly 6171d60f44 [formerly 60d13f2282] [formerly 5add905ea7 [formerly 68febf5d9bff68e752d039fddc853a0e5793b05d]]]
Former-commit-id: 5add905ea7
Former-commit-id: 1312e2ba34 [formerly 37fc71a726]
Former-commit-id: 459e00df31
2013-03-27 17:59:58 -05:00
Steve Harris
f59f1f02b0 13.3.1-14 baseline
Former-commit-id: 91a5e4578e [formerly 9022c500ce] [formerly 91a5e4578e [formerly 9022c500ce] [formerly 9fba973fd0 [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]]
Former-commit-id: 9fba973fd0
Former-commit-id: 936e4adda2 [formerly 2ca160caf0]
Former-commit-id: 8237fdadaa
2013-03-27 17:59:34 -05:00
Ben Steffensmeier
07438ab40a Issue #1821 make GridInfoCache more elaborate.
Change-Id: Ib64a68ab4e898eba5fe186ac5ac01407964e37d9

Former-commit-id: a31dc1874b [formerly bc8729d631] [formerly a31dc1874b [formerly bc8729d631] [formerly 4b6d2fd8d1 [formerly c7b4e7c982fb682779b729d1a8a8fb5ff6f5e1d2]]]
Former-commit-id: 4b6d2fd8d1
Former-commit-id: 60b2259343 [formerly e4462ee41a]
Former-commit-id: 03eade5b98
2013-03-27 17:28:45 -05:00
Richard Peter
0522d43c7f Merge "Issue #1827 Create registry/datadelivery client features" into omaha_13.3.1
Former-commit-id: c11b070571 [formerly c8ae09ab1d] [formerly c11b070571 [formerly c8ae09ab1d] [formerly 70a7c3c556 [formerly a104b57c33655022bc142b71e909e8fb1b1c022b]]]
Former-commit-id: 70a7c3c556
Former-commit-id: be2a8e1b16 [formerly de88cceb8c]
Former-commit-id: 09801abaf4
2013-03-27 17:08:00 -05:00
Dustin Johnson
198fb2b6ae Issue #1827 Create registry/datadelivery client features
Amend: Add event plugins and their dependencies to client features

Change-Id: Ib80522161740857d4332b84bbedad10e19683602

Former-commit-id: fbcfdd0ca1 [formerly 52c27ec57f] [formerly fbcfdd0ca1 [formerly 52c27ec57f] [formerly 1684507bdb [formerly 0011ef9ba9d014decf30acc2913fa535562d0de2]]]
Former-commit-id: 1684507bdb
Former-commit-id: 2591041c9d [formerly f27ebfbc1b]
Former-commit-id: c5685dbe9f
2013-03-27 15:38:36 -05:00
Ben Steffensmeier
06030b77b4 Issue #1821 Speed up GridInfoCache.
Change-Id: I14a92d85994c25dc7f80828efd12d2d4e2e70e40

Former-commit-id: bd35a06d51 [formerly 2a13abd32c] [formerly bd35a06d51 [formerly 2a13abd32c] [formerly 6f525a81b4 [formerly fde9f936e53a998f8cde174935d00287e6aaf70c]]]
Former-commit-id: 6f525a81b4
Former-commit-id: bc0153dbba [formerly 72724108b7]
Former-commit-id: b621850bc6
2013-03-27 13:21:33 -05:00
Ron Anderson
583d14ad21 Merge "Issue #1833: Add performance log file to ingest and ingestGrib" into omaha_13.3.1
Former-commit-id: 60735ddd83 [formerly 841a69ed59] [formerly 60735ddd83 [formerly 841a69ed59] [formerly 33d78bc7ee [formerly 9b35437ccfecaf70470a9a96fbc3acacd7cf1405]]]
Former-commit-id: 33d78bc7ee
Former-commit-id: dc74b366e9 [formerly 6a393ee4f9]
Former-commit-id: 3fbeeadef3
2013-03-27 11:22:48 -05:00
Nate Jensen
185b0ebbc2 Merge "Issue #1832 fix getNumPy() error handling" into omaha_13.3.1
Former-commit-id: caeb823043 [formerly dd3601a873] [formerly caeb823043 [formerly dd3601a873] [formerly aaf2d7bc2a [formerly f1cabae64e37120f27235ec44b4bd7a1921fe621]]]
Former-commit-id: aaf2d7bc2a
Former-commit-id: adeeccc9c7 [formerly da024a1044]
Former-commit-id: 329a106ef3
2013-03-27 11:16:56 -05:00
Mike Duff
e8d921f415 Issue #1834 - Filter config file reads for xml only, wrap unmarshalling and log errors
Change-Id: I23829b764e1f52e9dee1a1d9701d219e949eb9fa

Former-commit-id: 1beb6e4fa5 [formerly 1958700112] [formerly 1beb6e4fa5 [formerly 1958700112] [formerly 302dbf2cfb [formerly 5304de6fff49f3db7a3b46427077c7d2d9c0b3f9]]]
Former-commit-id: 302dbf2cfb
Former-commit-id: c143b356ef [formerly 3d1c1b146c]
Former-commit-id: 16f03eb52c
2013-03-27 10:38:59 -05:00
Richard Peter
786b68279d Issue #1833: Add performance log file to ingest and ingestGrib
Change-Id: I650fa5893a31bee6c4f0e96af87754518df6d25d

Former-commit-id: 25d4905570 [formerly 5287a3296b] [formerly 25d4905570 [formerly 5287a3296b] [formerly b75ceeeeb3 [formerly 53cb92842c43349968b70bb5fec5beb100773b63]]]
Former-commit-id: b75ceeeeb3
Former-commit-id: 6923e10550 [formerly f99242f539]
Former-commit-id: 33c602b13e
2013-03-26 20:55:42 -05:00
Nate Jensen
d7a7b66b1d Issue #1832 fix getNumPy() error handling
Change-Id: If2a0d3747c38cf716c3fa431c4135f2dee7c5405

Former-commit-id: dc53db5181 [formerly e4cdfe0ca9] [formerly dc53db5181 [formerly e4cdfe0ca9] [formerly 74b21dc1b4 [formerly ce7e89b8300580a57a5c133a78e8c84e2cb7449e]]]
Former-commit-id: 74b21dc1b4
Former-commit-id: 0cf9a03133 [formerly 494a673c37]
Former-commit-id: d1d647a778
2013-03-26 18:30:19 -05:00
Nate Jensen
2fe6904a03 Merge "Issue #1791 Fix problems in SmartScript when there is no data." into omaha_13.3.1
Former-commit-id: 807d8773ad [formerly f3fd91c311] [formerly 807d8773ad [formerly f3fd91c311] [formerly c895ee60fa [formerly a12ccd946a59dae45a4b5b754655d8eef7a56a29]]]
Former-commit-id: c895ee60fa
Former-commit-id: 30bd797879 [formerly 5701030750]
Former-commit-id: 79fddbcbf5
2013-03-26 16:15:27 -05:00
Richard Peter
7c40d051f5 Merge "Issue #1828 Fix intlsigmets and text pattern." into omaha_13.3.1
Former-commit-id: ac3619cc77 [formerly fa7fb4765f] [formerly ac3619cc77 [formerly fa7fb4765f] [formerly cbf915093f [formerly e9a9cbc4b3c20dce7dc39837c9aab4ae5ef6e01a]]]
Former-commit-id: cbf915093f
Former-commit-id: 4f326d5c39 [formerly f941b97c06]
Former-commit-id: 047c3d0e37
2013-03-26 15:33:33 -05:00
Lee Venable
8e1fc66f03 Merge "Issue #1799 Fix pan/zoom when in views." into omaha_13.3.1
Former-commit-id: ad1983ff8d [formerly 1a59204892] [formerly ad1983ff8d [formerly 1a59204892] [formerly 049e955db9 [formerly 69ec257d3a90ffcaa81d92f34ff545d4c49bb1d3]]]
Former-commit-id: 049e955db9
Former-commit-id: cb683bec2a [formerly f8d2fdacea]
Former-commit-id: f0ed70f9fb
2013-03-26 15:01:51 -05:00
Roger Ferrel
d76cbc6e80 Issue #1828 Fix intlsigmets and text pattern.
Change-Id: Id5bc5d5738a00ae1607c772bfe1bf675c48db2b0

Former-commit-id: 6a4bd66abc [formerly 19074d3053] [formerly 6a4bd66abc [formerly 19074d3053] [formerly 74389834de [formerly 84448e12d2f09637bc4f79e42f21c11e561b8c37]]]
Former-commit-id: 74389834de
Former-commit-id: 7244b4d23c [formerly 4c5aa32169]
Former-commit-id: 8cdcee0ec5
2013-03-26 14:47:48 -05:00
Ben Steffensmeier
8d88fa1ba9 Issue #1791 Fix problems in SmartScript when there is no data.
Former-commit-id: 9d9443644c [formerly 6870045005] [formerly 9d9443644c [formerly 6870045005] [formerly 18311b0d18 [formerly 39d0a9f0cc71f3dbbde69e6d1dac14ef93a78984]]]
Former-commit-id: 18311b0d18
Former-commit-id: 6d17d01f8c [formerly 69879c51df]
Former-commit-id: b76bdc602d
2013-03-26 14:46:11 -05:00
Lee Venable
125517e2d2 Merge "Issue #1819 Added precision fields for point source configuration." into omaha_13.3.1
Former-commit-id: 68e767daaa [formerly c86daf885b] [formerly 68e767daaa [formerly c86daf885b] [formerly c1adce3a11 [formerly 8753aa9e648778c2eabbf959c1b270ebe5add67c]]]
Former-commit-id: c1adce3a11
Former-commit-id: 013748405d [formerly 393e6d9ca1]
Former-commit-id: ea68209a19
2013-03-26 14:33:24 -05:00
Richard Peter
2e5fdfc82c Merge "Issue #1783: Update DatabaseArchiver to stream deserialization of previous records" into omaha_13.3.1
Former-commit-id: ce83569845 [formerly b947a52604] [formerly ce83569845 [formerly b947a52604] [formerly 7ee513dfed [formerly b1acf59c03ab308b86843a314d4795f6392de844]]]
Former-commit-id: 7ee513dfed
Former-commit-id: 9c5ce8e741 [formerly 45a2f3f3dd]
Former-commit-id: 109b578382
2013-03-26 12:59:47 -05:00
Steve Harris
0d88cd619b Merge branch 'master_13.3.1' into omaha_13.3.1
Former-commit-id: 85104939ac [formerly e71c69c383] [formerly 85104939ac [formerly e71c69c383] [formerly 9ff8a94193 [formerly 741a32d9209897e84da068626d28c7d7af47f9c1]]]
Former-commit-id: 9ff8a94193
Former-commit-id: 02147470db [formerly b926ff60b3]
Former-commit-id: 779adedea9
2013-03-26 12:44:24 -05:00
Steve Harris
25a851cccf 13.3.1-13 baseline
Former-commit-id: 792171756f [formerly c77a452f5a] [formerly 792171756f [formerly c77a452f5a] [formerly c65f3e68e5 [formerly 9c263e3ffc35677d7015158e06b64f376e7f801d]]]
Former-commit-id: c65f3e68e5
Former-commit-id: 4f2e9aec0d [formerly 822d05a709]
Former-commit-id: 7aa4f7b265
2013-03-26 12:43:07 -05:00
Jonathan Sanchez
d31efead69 Issue #1819 Added precision fields for point source configuration.
Former-commit-id: a0a0199266 [formerly 79d87a96e7] [formerly a0a0199266 [formerly 79d87a96e7] [formerly b0f61cf86c [formerly b250ff50f8a2ac6ad8ec91e14735edcd6f053343]]]
Former-commit-id: b0f61cf86c
Former-commit-id: a579da7646 [formerly eb13af2f50]
Former-commit-id: cc64195d47
2013-03-26 12:29:18 -05:00
Ben Steffensmeier
81814dfa65 Issue #1799 Fix pan/zoom when in views.
Former-commit-id: d06f011de0 [formerly 643c1c77d0] [formerly d06f011de0 [formerly 643c1c77d0] [formerly 78fdea2ba1 [formerly 2061956526bdc3da43280e6c829de1deb0a098ba]]]
Former-commit-id: 78fdea2ba1
Former-commit-id: e79778366c [formerly 5a1171f111]
Former-commit-id: 69068bbf3a
2013-03-26 11:44:23 -05:00