labofsahil/github-event-dataset-2012 huggingface dataset:
Add full test back in
Still refactoring some common patterns
Add rum2sam
Improve test coverage for merge_Bowtie_and_Blat
Use autodie
2012-12-17
again yesterday's work
Fixed dying while in combat bug...
+comments, +guards, change vim theme
Added ResultMode Supports for hprose for Ruby

Fixed some other bugs.
Support for GHC 7.6.1.
Renamed initial_data to sample_data to skip loading at syncdb
Add TODO
Minors fixes
Create MongoService
Add some sample datas
Intermediate commit
Broken commit, first try to add DAO methods
Refactored code to use DAO
Use better names
Rename dao
Add services fiels
Once again, name refactoring
Add some data samples
Too big commit :/
Working on import
i m not too far to get initial import working
Fix import working
First try of custom validators. Work almost fine, except all error messages disappears :/
Improve modify object form
Minor improvements
ip: fixing assertion -500882 (thanks to bryan <bnewbold@robocracy.org>)
quagga: rename zapiV2_header ZEBRA_VERSION2
quagga: zsock_send_route()
ip hna niit: iproute() remove iifname argument
ip: iptrack(), struct track_key use struct net_key
hna quagga: move BMX6_ROUTE_ types to hna
ip: refactoring iptrack() iproute() ip_flush_routes() ip_flush_tracked() is_policy_rt_supported() cleanup_ip()
quagga: preparing opt_export() --export
ip hna: iproute( specify IP_ROUTE_TUNS + BMX6_ROUTE_ type )
hna: simplify configure_tunnel_out()
ip: enhance track2str() for BMX6_ROUTE_ types
ip hna quagga: adding --tunOut /exportDistance and /exportOnly ,removing opt_export() --export ...
hna ip quagga: set_ipexport()
ip: iptrack(), fixing quagga modifications...
ip schedule: refactoring rtnl_talk() usage
ip: fixing rtnl_talk() ...
ip: fixing is_policy_rt_supported() ...
ip: fixing is_flush_rules ...
ip: fixing is_flush_tracked ...
ip: fixing iptrack() is_flush_tracked() ...
Update test README
Merge branch 'restart_bug'
Merge branch 'master' of github.com:Ensembles/ert
Added CMake test to check if explicit linking with libdl is required
Merge pull request #15 from joakim-hove/ld-check

Ld check
Added test_dlopen.c
Stash pop?
Compile fix in ld-check branch
Merge pull request #16 from joakim-hove/ld-check

Added missing file
Added PropertyAnimation
additions for redirection
Trying to add support for Python 3.2.
Revert "Merge branch 'master' of git://github.com/imathis/octopress"

This reverts commit 7a29f29ef9ce9391d925958565c388e2e143673c, reversing
changes made to 6a9539c2461bdf1affea6692d4be2ed96e3d236c.
Publish Switches post
wireprotocol: use visibleheads as reference while unbundling (issue 3303)

The `repo` object here is *always* local. Using `repo.heads()` ensure we will
reject push if any secret changeset exists.

During discovery, `visibleheads` were sent to the peer. So we can only expect it
to send us `visibleheads` back. If any secret changeset exists::

    visibleheads != repo.heads()

This fix server side part of issue 3303 when pushing over the wire.

--HG--
branch : stable
revlog: backout e5750c6716eb

This regresses performance of 'hg branches', presumably because it's
visiting the revlog in the wrong order. This suggests we either need
to fix the branch code or add some read-behind to mitigate the effect.

--HG--
branch : stable
merge: check for untracked files more precisely (issue3400)

This fixes the regression, but still leaves the long-standing issue
that merge doesn't cope with trying to merge files and directories.

--HG--
branch : stable
branchmap: server should not advertise secret changeset in branchmap (Issue3303)

Discovery now use an overlay above branchmap to prune invisible "secret"
changeset from branchmap.

To minimise impact on the code during the code freeze, this is achieve by
recomputing non-secret heads on the fly when any secret changeset exists. This
is a computation heavy approach similar to the one used for visible heads. But
few sever should contains secret changeset anyway.  See comment in code for more
robust approach.

On local repo the wrapper is applied explicitly while the wire-protocol take
care of wrapping branchmap call in a transparent way. This could be unified by
the Peter Arrenbrecht and Sune Foldager proposal of a `peer` object.

An inappropriate `(+i heads)` may still appear when pushing new changes on a
repository with secret changeset. (see Issue3394 for details)

--HG--
branch : stable
temperature_loss
DOCS335 checkpoint
simulavr: fix build (pkgrel 3)
revert libv8
Bugfix: For 'oil generate scaffold' & 'oil generate admin'.
Validation error messages doesn't reflected bootstrap css style when 'oil generate scaffold'.
Validation error messages force html escaped when 'oil generate admin'.
ul tag enters the p tag when generate scaffold.
Merge pull request #129 from mp-php/bugfix_oil_generate

Bugfix: For 'oil generate scaffold' & 'oil generate admin'.
Typo - thanks Daniel Goertzen
Form Settings
Define FAULT_PROTECT_ENABLED to zero for non-darwin
Moved into subdir
ZF-12225 - Fixed classname in Zend_Cloud_StorageServer_Rackspace
ZF-12311 - Fixed capitalisation in HTTP headers
ZF-12309 - Rackspace objects no longer prepended with '/'
ZF-12312 - Listing empty container no longer throws exception
Changes to enable sending Transfer-Encoding: chunked requests

- Adds Zend_Http_Client_Chunked class, extending client to handle appending data to open requests
- Adds Zend_Http_Client_Adapter_SocketChunked class, extending the socket adapter to handle chunked requests
- Slightly modified Zend_Http_Client to avoid duplicating code
Streaming improvements for Zend_Service_Rackspace_Files

- Zend_Service_Rackspace_Files now supports fetching data ranges and sending data via Zend_Http_Client_Chunked
- Added Zend_Service_Rackspace_Files_Stream stream wrapper class
- Added class for handling checksums from multi-sequence cloud-files transfers
- Modified Zend_Service_Rackspace_Abstract to recognize Transfer-Encoding: chunked requests
changes wrt dafsa
Update stacks info.
Big work with navigation bar. Background should be adjusted.
history & using mdmenu
added interactive light movement
added new drum texture, removed creepy moon from scene
added texels in a more suitable way than before

texture will be added 2 times on each rotational body (in opposite directions such that there are no interruptions on the texture)
got started with task 2
[Xwt.Wpf] Implement IWindowBack.TransientFor

We correctly parent modal windows now, as far as I can tell.
[Xwt.Markdown] Add support for setex headers
change cpu frequency
Cleanup git add profiles/package.mask/funtoo-staging :-)
Merge remote-tracking branch 'upstream/master'
Add back incorrectly git-ignored .sql files, remove superpom sources jar
dependency
Merge branch 'master' of https://github.com/nasa/mct

Conflicts:
	platform-assembly/pom.xml
Merge branch 'master' of https://github.com/nasa/mct
Changed scroll to to use position instead of offset().
BinaryTree WIP
Move the K3 backend to Backend.K3
[#54,download,bugfix][s]: provide decent progress information even when no information on total download size (fixes #54).
Merge branch 'release-debian-sid'
Merge PR #785 branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10835] changing "e-mail" to "email"
  [ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entry
  [ticket/10835] fixing misleading message in UCP

Conflicts:
	phpBB/language/en/ucp.php
Added required empty dirs.
demo maze Amazing.py fixed to match new structure
Wrap smp_processor_id in kpreempt_[dis|en]able

After surveying the code, the few places where smp_processor_id is used
were deemed to be safe to use with a preempt enabled kernel. As such, no
core logic had to be changed. These smp_processor_id call sites are simply
are wrapped in kpreempt_disable and kpreempt_enabled to prevent the
Linux kernel from emitting scary warnings.

Signed-off-by: Prakash Surya <surya1@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
Issue #83
Revert "Use SA_HDL_PRIVATE for SA xattrs"

This reverts commit ec2626ad3f695a2ced3946c4197ef64cbcac4959 which
caused consistency problems between the shared and private handles.
Reverting this change should resolve issues #709 and #727.  It
will also reintroduce an arc_anon memory leak which is addressed
by the next commit.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #709
Closes #727
Drop spill buffer reference

When calling sa_update() and friends it is possible that a spill
buffer will be needed to accomidate the update.  When this happens
a hold is taken on the new dbuf and that hold must be released
before calling dmu_tx_commit().  Failing to release the hold will
cause a copy of the dbuf to be made in dbuf_sync_leaf().  This is
done to ensure further updates to the dbuf never sneak in to the
syncing txg.

This could be left to the sa_update() caller.  But then the caller
would need to be aware of this internal SA implementation detail.
It is therefore preferable to handle this all internally in the
SA implementation.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #503
Closes #513
OS-682: ARC minimum is set too high, potentially blocking VM creation

Ported-by: Richard Yao <ryao@cs.stonybrook.edu>
Revert CONFIG_PREEMPT checks
Modify fm_ena_generate to support preemptable kernels
Modify txg_hold_open to support preemptable kernels
Make zvol_remove_link() print a more useful error message
Set discard_zeroes_data on zvols

This implements a suggestion by Richard Laager. It ensures that the
kernel will know that discard operations are guarenteed to zero blocks.

Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
Make zvol_get_data() use KM_PUSHPAGE
Set KM_PUSHPAGE in zvol_get_stats()
Disable some code
Use SPL headers in kernel code
Added beginning of generator
varied generator working? clock is in debug mode
ZOMG ZOMG ZOMG ZOMG ZOMG ZOMG
End state and new game
building animation fixed, clock too fast
Fixed building palette
Switched scrolling to use I instead of X
Lowered and extended buildings
Use tweetstream gem
Add new texture feature (not used yet)
[FIX] fixed toplevel validation
Cheaper map owner check
use a different strategy to re-run XDS if it fails
The previous implementation was for the full processing. Now we increase
the spot range by 20 for a total of 3 runs.
Resolve conflict from last merge (prevents compilation).
Merge pull request #19 from fetzerch/buildfix-tsp1

Fix broken build after last merge with opdenkamp/master
Updating documentation for build_xpath
Merge pull request #220 from tzz/master

Redmine #1598: add cf-sketch hooks to masterfiles
Merge pull request #221 from shaunamarie/features-xml-buildxpath

Updating documentation for build_xpath
Make KeepPromises not static and explain why
Add "listen" attibute for body server control to disable listening on port (for nodes)
Merge pull request #224 from maciejmrowiec/master

Add "listen" attibute for body server control to disable listening
Fix SetServerListenState reference error.
Respect ordering of atexit(3) and RegisterAtExitFunction (Redmine #1627)

RegisterAtExit functions were called after all other functions registered by
atexit(3), which resulted in crashes due to out-of-order deinitialization.

Given that RegisterAtExitFunciton is only strictly necessary under Windows for
Windows service implementation, ensure that Unix variants use ordinary atexit(3)
function and separate list of cleanup handlers is only collected under Windows.

Given Windows service won't call atexit(3) anyway, ordering is not important in
this case.
Unit test for atexit.c functionality
Register DB cleanup function after at least one DB is opened (Redmine #1627)

Otherwise cleanup function registered by DB library may kick in too early, so
CloseAllDB will crash.
Retire code that was moved to Enterprise
Merge pull request #225 from markburgess/master

Remove retired code
Factor out keyring.h and export RemovePublicKey. This is now reused by cf-hub for keys cleanup. Redmine #785
Fix PrintRval and PrintItemList truncation #1680
Merge pull request #226 from maciejmrowiec/master

Fix PrintRval and PrintItemList truncation #1680
spell fixes to manuals
Merge pull request #227 from cf-gary/master

spelling fixes to manuals
add notes and example for listen attribute
bugfix listen attribute notes and example
Merge pull request #228 from cf-gary/master

add notes and example for listen attribute
add faces & lambert material
Fixed 64-bit formatting for Mac OS X x64.

git-svn-id: http://yate.null.ro/svn/yate/trunk@4988 acf43c95-373e-0410-b603-e72c3f656dc1
Added callto hint label in ui. 

git-svn-id: http://yate.null.ro/svn/yate/trunk@4989 acf43c95-373e-0410-b603-e72c3f656dc1
Added the banbrutes PHP script to the default install.
Added note that Yate needs to run as root for banbrutes.php to work.


git-svn-id: http://yate.null.ro/svn/yate/trunk@5221 acf43c95-373e-0410-b603-e72c3f656dc1
number params decimal money splitter attr
fix stop-server to make it safer
 Changes to be committed:
	modified:   src/nao/c_remote.scm
	modified:   test/remote.scm
Ignored the presentation which is only kept locally
save
Merge branch 'mark15' of https://github.com/xwd/ccsr into mark15
save
save
add mexa64 for linux x86_64
Safari and Android console.log is 1-arity.
Stop prepending `undefined` for dep scripts.
SimpleEvents and SockJS are no longer global vars.
Remove leading semicolons.
Putting tables in a 1/3 2/3 grid, update copy

Conflicts

	src/datatable/docs/datatable-masterdetail.mustache
	src/datatable/docs/partials/datatable-masterdetail-source.mustache
Edits and code cleanup

Conflicts:

	src/datatable/docs/datatable-chkboxselect.mustache
	src/datatable/docs/partials/datatable-chkboxselect-source.mustache
Redoing the JSON unit test fix for Win 8 support from 2c92314df5f878972ce899ce106920aa18e65f32. Got blown away in a merge
Merge branch 'master' into 3.x
Minor tweaks to build sripts
Fine tune Bug 3315668: doModal Window sometimes can't close with a cluster weblogic
Merge branch '6.0' of github.com:zkoss/zk into 6.0
Merge branch '6.0'
~update sdk dir path
~sync
~FakeSemVar => SoftSemVar
*I think Session shouldn't operate player directly
malven
und code
update readme
 * added base files
 * updated version and made sure we can build a gem
fix Issue 8429 - [2.060 beta] 'version' rejected inside 'static if's

This is a regression of fixing bug 7911.
Introduced commit: e558866cdd8c26daf90942ee6dd89e814347911b

StaticIfDeclaration::setScope speculatively distributes the scope to members, and ConditionalDeclaration::setScope evaluate its condition.
So, the root cause is too early evaluation of  the condition of version block which in static if.
Merge pull request #1070 from 9rnsr/fix8429

Issue 8429 - [2.060 beta] 'version' rejected inside 'static if's
--Type;;equals
+1 Type::equals
For corner case, without breaking std.format unittest.
Exemple OpenNI sans OpenCV, dépendance à l'éxécution à déterminer
added rot13 script
working on converting the database class.
running tests works
Working on the database DI
use factory service
fix DIC calls
fix more calls
fixed injections
fixed bugs
remove debug code
add documentation
fixed unit tests
closing database connections.
Fixed db problem
removed strange scripts
install.sh install ssh config ok
Remove debug info
Clean up
Fixes #4485 walled garden lets a plugin take over index page
ignored doc/tags for yankring
Cyrus SASL auth: SSF retrieval was incorrect.

Exim thought protection layer was required, which is not implemented.
Patch from Wolfgang Breyha.

Fixes bug 1254
Merge branch 'hotfix-3.2.2'
Merge branch 'release-3.2.3'
dearc

архивация в середине года приводит к непредсказуемым последствиям
Merge branch 'hotfix-3.2.4' into develop
Previous token was an extra declaration fixable by transposing two lines.

I removed it, and renamed 'current' to 'state' and 'next_token' to
'next_state'.
apparently we need to declare the type of the $ids global here to avoid errors with some versions of PHP
Added some comments in the example.
Added a ChangeLog file.
MANTIS_PLUGIN: Forbid issue deletion if timetracks exists
Use template engine for Check page
Encoding problems
Set smarty directory
Merge pull request #12 from NSV/CheckPageTemplate

Set smarty directory
tmp files should be created in /tmp
Merge branch 'smarty'
more filters.inplacereprojection
put back copy constructor, start reworking a bit to prep for LAS 1.4
set values on header directly in preparation for removing public methods of driver.las.Writer that deal with the header in favor of giving user the ability to manipulate the header directly themselves
add --count option to pcpipeline and pc2pc to specify how many points to write out for the given invocation
DibiPersistenceHelper: update fixed bug; zadny property ktery se persistuje neni zmeneny tak se updatuje 0 prvku, sql dotaz je pak chybny
Drobne upravy: zmensena sila normal, sever odpovida ose Z, mlha
Anaglyph
I'm playing with stuff
Ajout d'une image de gazon
Balles
changing background again
added missing directory
Merge branch 'master' of https://github.com/jp9000/OBS
Updated armor list for Rise of Rome.
Sundry OSX fixes.
configure: Don't abort if QtWebkit, QtScrir or lamemp3 aren't installed.
Unable to customize toolbar
Merge pull request #138 from Wikia/release-137-bugid-68464

Unable to customize toolbar
Just a huge commit: (almost) everything now use boost::locate::translate !
Also use getDBIdent() to not have database password in the source code.
Language selection working, using cookie instead of session, as session_alter_var re-send header.
(And as cookie stays even when after logout, it's better !)

And a lot of other things like stateList error handled slightly differently.
Added army.cpp : moved army display into another page
Removed Cutils, as I don't use it
And some other minor stuff
Added line to remove .po file from web folder
content from server
BRD update
Welcome slider
all files must gooooo
Correction of router with resizer doc sample, see #2740
Merge pull request #896 from akka/wip-2740-resizer-doc-patriknw

Correction of router with resizer doc sample, see #2740
Preparing mailbox-commons for bin compat
Fixing ScalaDoc messup
#2091 - Adding a small intro to the Microkernel docs to state what the purpose of it is.
support Ruby 1.9.2.
Update the 'Resources' section in month-of-lisp
Fix import for `virtual` from the SQLAlchemy backend [GH-127]

The SQLAlchemy backend was trying to import `virtual` instead of
`transport.virtual`.
Add a new test file for the SQLAlchemy transport

Add a simple test to parse URLs for SQLAlchemy.  This tests should prevent
issues that were introduced (GH-127 and the one fixed by f187ccdbcf1)
Merge branch 'franckcuny/master'
Adds Franck Cuny to AUTHORS
Fixed reports bug
Merge branch 'master' of https://github.com/athk/bsmi into archive
add notconfigured file
Update lib/View/CRUD.php

Exception "Editing not allowed" was never reached.
Merge pull request #86 from DarkSide666/patch-4

Update lib/View/CRUD.php
more fixes to cmdliner jenkins
cpu clock: round up when dividing by samples

Signed-off-by: Jens Axboe <axboe@kernel.dk>
Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
Update test data with actual parish names
Event masking.
Fixed two bugs in DynamoDB.  Fixes #717
重构，删除了在线的socket。整合到一条socket里面进行消息和在线tree的处理。删除多余的主题
Adding week 2 stuff
new
new
Working on Form Validation
Added descriptions to some rake tasks.
Updating charts.
Deving dynamic column selection for sunspot.
Deving dynamic column selection for sunspot.
Added 'operator' to find link.
tools: store-tool: generic leveldb store tool

Discard test/mon-store-tool and move it to a generic tool/store-tool

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
ceph-object-corpus: add branch to tolerate MMonProbe format change

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
CompatSet: users pass bit indices rather than masks

CompatSet users number the Feature objects rather than
providing masks.  Thus, we should do

mask |= (1 << f.id) rather than mask |= f.id.

In order to detect old, broken encodings, the lowest
bit will be set in memory but not set in the encoding.
We can reconstruct the correct mask from the names map.

This bug can cause an incompat bit to not be detected
since 1|2 == 1|2|3.

fixes: #2748

Signed-off-by: Samuel Just <sam.just@inktank.com>
OSD: set superblock compat_features on boot and mkfs

Previously, we did not actually persist the osd compatibility
mask.  Without persisting the current compat mask, a previous,
incompatible version of the OSD would not be prevented from
starting on the same store.

Signed-off-by: Samuel Just <sam.just@inktank.com>
PG: use write_info to set snap_collections in make_snap_collections

At one point, snap_collections were written to a pg collection
attribute.  Subsequently, they were moved to the biginfo object
since the structure can grow too large for limited size xattrs.
make_snap_collection, however, was not updated.

Using write_info here should prevent this from happening in
the future.

Signed-off-by: Samuel Just <sam.just@inktank.com>
PG: Place info in biginfo object

The purged_snaps set can grow without bound as snaps are
created and removed.  Because the filestore doesn't
provide unlimited size collection attributes, it's better
to place the full info on the biginfo object, since we
need to write it during write_info anyway.

Added CEPH_OSD_FEATURE_INCOMPAT_BIGINFO to prevent downgrade.

Signed-off-by: Samuel Just <sam.just@inktank.com>
upstart: simplify start; allow group stop via an abstract job

Use a 'ceph-mds' or 'ceph-mon' event to start instances instead of
explicitly calling start.  This avoids the ugly is-this-already-running
check.  [Thanks Guilhem Lettron for that!]

Make the -all job abstract (which means it stays started and can be
stopped).  Trigger a helper task (-all-starter) to trigger instance
start.  Make instances stop with the -all task.  This allows you to do

 start ceph-mds-all
 stop ceph-mds-all
 start ceph-mds id=foo
 start ceph-mds-all
 stop ceph-mds id=bar
 stop ceph-mds-all

but not

 start ceph-mds id=foo
 stop ceph-mds-all

because ceph-mds-all isn't running.  Not quite as flexible in sysvinit in
that regard, but good enough for me.

Fixes: #2414
Signed-off-by: Sage Weil <sage@inktank.com>
os/HashIndex: use set<pair<string, hobject_t>> rather than multimap

Multimap does not make any guarantees about ordering of different
values with the same key.  list_by_hash, however, assumes that
the iterator order matches hobject_t order.  Thus, we use
set<pair<string, hobject_t> > to get the proper ordering.

Backport: stable

Signed-off-by: Samuel Just <sam.just@inktank.com>
test/store_test.cc: verify collection_list_partial results are sorted

Synthetic test now also varies snapshots and uses a small variety of
hashes.

Signed-off-by: Samuel Just <sam.just@inktank.com>
CrushWrapper: change name of get_loc to more accurately reflect behavior


Signed-off-by: caleb miles <caleb.miles@inktank.com>
osd: return EOPNOTSUPP on bad class or method name

Currently we return EIO, which isn't particularly informative.

Signed-off-by: Sage Weil <sage@inktank.com>
librados: add assert_exists guard operation

Add a guard operation for writes that asserts that the object already
exists.  To avoid requiring new functionality on the OSD side, implement
this by including a STAT operation, and discard the results on the
client side.

Signed-off-by: Sage Weil <sage@inktank.com>
librbd: use assert_exists() to simplify copyup check

Previously we would explicitly STAT the object to see if it exists before
sending the write to the OSD.  Instead, send the write optimistically, and
assert that the object already exists.  This avoids an extra round trip in
the optimistic/common case, and makes the existence check in the initial
first-write case more expensive because we send the data payload along.

Signed-off-by: Sage Weil <sage@inktank.com>
osd/osd_types: make stat osd_op print nicely

No 0~0 crap.

Signed-off-by: Sage Weil <sage@inktank.com>
Merge branch 'wip-assert-exists-2'

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
client: Put all libcephfs gtest tests into one bin

* Modify the Makefile.am to run all gtest libcephfs tests through
a single binary: test_libcephfs.

* Add tests for #2285, #3186, and #2778

Signed-off-by: Sam Lang <sam.lang@inktank.com>
osd: debug EMSGSIZE / OSD_WRITETOOBIG

Signed-off-by: Sage Weil <sage@inktank.com>
Added key for Gina Minks
General

Potential + Availabilitiy bug (case 17) is solved
Potential - Hint rename
jQuery ui dialog to reset functions
Working on loading message
Push skeleton files
seperated out commands to individual files
added replace command
added keep command
added sort command and removed the markdown dependency
Touchups to README.md
PTreeView
[adm] Report: 3.1 Distributed resources' configuration + 3.2.1 Provider's design
rm ACK from cabal file
bump xattr version
non -recurseve misoi2
Now using fp-core submodule.
Now using fp-core submodule.
some NetWM support
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/TaobaoTesting.suo
Rev .1
metets
Alineación Quejas
ESOS
first commit
second commit
LANGUAGE_TypeFamilies was missing from eq.cabal
fixed exception raised when flexible_height is set but flexible_max_height is not in format
Merge branch 'master' of github.com:ella/ella
Merge branch 'master' of github.com:ella/ella
Python 2.6 compatible tests
Fix format: year is given with 4 digits.
Move assertion closer to the case it protects.

When search_value contains 'type' key, it is checked to not contain
'operator', so there can be no collision there.
shorter paths to avoid shebang issues
Role Definitions use category to classify different types of local roles
so use their categories' reference.
Drop commented code from copy and paste
Add more site dumping scripts.
don't be too violent
comment useless case
SynchronizationIdGeneratorMethodId is deprecated, do not test it any longer
debug -x
Merge pull request #2 from acsaba22/review

debug information for nix-init script
CS-5252 ordering by first name or last name in the name field
Commit
Merge branch 'master' of https://github.com/fabiim/AW
sssd
Merge branch 'master' of https://github.com/fabiim/AW

Conflicts:
	model/Model.php
	webservice/noticias.php
asdasd
liblazy-0.2+git20071107 (untested)
Added tinc to batman and bat0 to br-lan.

I set the prefix on br-lan to /48; now all freifunk traffic should go into the
bridge and be routed by batman if it's not local.
Is it wise to have radvd running on a batman interface?
Merge branch 'master' into wr1043nd

Conflicts:
	etc/config/batman-adv
	etc/config/network
Set tinc interface up/down when tinc starts/stops.
Merge branch 'master' into wr1043nd
first stab at streaming for issue #34
fix some code paths for fallback `format` for early node versions
issue #36: Would like ability to use -i with color disabled
prepare for 4.0.1 release
prep for future dev
Drop (failing) stream test case. Only belongs on the "streaming" branch.
json v5, issue #35, issue #36: special case output for JSON output mode and a single lookup to emit just the looked-up value
prepare for 5.0.0 release
prep for future dev
I don't keep around a recent node 'master' build anymore
possible TODO
issue #34: streaming with an event emitter
re-added stream test case
Merge branch 'streaming'
libs repo added
set py filetype back to py3
removing gitignore in tmp
Allow log levels to be defined as an array instead of a threshold
Added tests for validation methods (all but valid_string).
Revised current tests for required_with method
Merge pull request #981 from xsbeats/1.3/develop

Added tests for validation methods (all but valid_string).
added some changes#
legal notice mobile

apply style
Update app/assets/stylesheets/mobile/mobile.css

change css "checks to radiobuttons"
[AE] fixed linux build
Converted to mysql backend

Everything uses mysql as a backend now. PHP scripts are ready for
multiple users, go backend not yet. Also fixed a tiny bug in player.js

Fixes #14
Fixes #11
Added Grbl state in status report. Removed switch support.

- Added Grbl state (Idle, Running, Queued, Hold, etc) to the real-time
status reporting feature as feedback to the user of what Grbl is doing.
Updated the help message to reflect this change.

- Removed switches (dry run, block delete, single block mode). To keep
Grbl simple and not muddled up from things that can easily be taken
care of by an external interface, these were removed.

- Check g-code mode was retained, but the command was moved to '$C'
from '$S0'.
Add POM and make some clean
corrected deployment path, from atlas to gxa
replaces html resize of the hide bar chart button with manually resized image because some webkit engine versions were not resizing properly
Merge branch 'master' of github.com:gxa/atlas
Update title of REFERENCE to HTML

Haml's default format is no HTML everywhere. Update title of
REFERENCE.md to match.
sample app
sample app
temlates,static
bash script
nested routes and nested form
Make compatible with `network-2.4` API

The specific API change in `relativeTo` this changeset
compensates for has been introduced in

 haskell/network@4a3fdefe2228e0998bbf80969e5dddf943ebe99a
Merge pull request #1044 from hvr/network24

Make compatible with `network-2.4` API
On install, update the .cabal file with the one from the index

(patch manually merged into the cabal-1.16 branch)

This allows us to make minor changes to packages after they have been
released, without changing the package .tar.gz file. We already keep
the .cabal file outsite the package in the index and use it for
dependency planning. This already lets us do fixes such as making
dependency constraints tighter. Currently we cannot make dep
constraints more relaxed however, since the original .cabal file is
the one used when we get to the actual configure step.

So with this change, we now use the updated .cabal file for the
configure and build too. So there's more fixes we can do post-release.
In particlar, in combination with easier editing on hackage, this
should help us address the problems around the PVP and open or closed
version constraints. It should allow a system of conservative upper
bounds, but allow editing them when new versions of deps are released
and we find that they happen to work fine.
Extend the unpack command for the .cabal file updating

By default, "cabal unpack blah" will also update the .cabal file with
the one from the index, so it's consistent with what you get via
cabal install. Also added a --pristine flag so you can get the original
tarball without the updated .cabal file.
Bump Cabal version number to 1.16.0.1
Bump cabal-install version number to 1.16.0
Update bug tracker location
Fix building cabal-install with ghc-6.12 and older

Fall back to using serial rather job control for base < 4.3.
So this means if you build caba-install with ghc-6.12 or older
then the -j flag will do nothing, it'll still run serially.

BTW, if anyone wants to build cabal-install using a Haskell impl
with no support for concurrency then they can use the same trick.
(The serial and parallel job control impls deliberately share the
same interface.)
Disable setting the jobs: $nprocs line in default ~/.cabal config

It breaks for fresh installs with users who have Cabal-1.6.0
rather than Cabal-1.6.0.1, ie users of ghc-7.6.1.
audio output is now configurable
add setch command to change fm channel on the fly
sett2
GMMTrainer: Add possibility to get and set internal GMMStats
Force to save in old netpbm formats instead of PAM (ticket #95)
profiling, vrects; release 1
Added two common string resource.
Changed the default box width of inputs and selectors to 200.
Added string resources
Added the 'src' argument when fire 'command' event in j3.DataList. Call 'onCommand' method if exists before fire 'command' event.
[initrd] Add ability to reshuffle initrds into image list order

Signed-off-by: Michael Brown <mcb30@ipxe.org>
[bzimage] Allow initrds to be rearranged in place

At present, loading a bzImage via iPXE requires enough RAM to hold two
copies of each initrd file.  Remove this constraint by rearranging the
initrds in place.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
192 - ruby install should not print output to console, just to a log file
168 - adding option to unzip or not files when downloading them
110 - moving "WEB Apache frontend http vhost - 11H1" to recipe "configure_load_balancer_forwarding"
118 - Adding debugging
294 TC build agent sporadically appears stopped and disconnected after a successful launch - removed call to log that is unavailable in the template scope , inspecting marchalling
CDI-50, @Vetoed is for all types
Rename attr storage to engine, fix handling and add URI
delete pgsql jdbc driver
IE fix : some tests skipped (missing es5 features)
Initial import
Merge branch 'master' of github.com:jpuig/epi
fix bogus test.
Add EABI4 and EABI5 for arm
No need to statically initialize physmem here, it is set to the correct
value in pmap_bootstrap(), which is early enough.
Tested on my Centris 660AV.
Workaround libc not exporting in6addr_any when built with MKINET6=no.
Bump date for more hardware support.
If ch_ndrives is > 0, then ch_drive is not supposed to be NULL.
[KG] trying to fix activeadmin in prod
Adding KGMenuBarPopup
freshly cythonized
don't quit when one bench fails:
helps debugging with the bug specific to pilatus 1M images
Removed apple specific code
Wersja z dropboxa od nas
[add] Python stuff

Added Django, Python and virtualenv stuff
started a blog with help from jekyll
Reorganized linear maths.  Fixed README.

Moved all linear maths into subdirectories and moved into the linear namespace; updated tests.
Fixed a strange emboldening issue in README.md (report that this doesn't work: `(**bork**)`, even if you try to escape the parentheses).
Added FNV hash implementations and tests.
Added new method to TrieNode.
Make sort support operator>>
Misleading to attribute the barrier to sort
renamed package from github.tmdb to github.kw3r.tmdb
file web service committed
additions in numerosities in MlASLCS3UpdateAlgorithm. also, conditions
Adding bash profile.
Trying something with my gitconfig.
Adding RTK-specific stuff
Git stuff working.
Some refinements for RTK
Right.
Minor change.
Oops. Left a private key in. Poof.
Git prompt goodies.
Minor mode changes.
Move ssh-add to execute only for login shells.
Better vim dirs setup for git.
Another known host.
Simpler template for commits.
A few nifty date tricks.
SSH weirdness.
Hostname/IP for EC2 instance has changed since reboot.
EC2 stuff.
Getting SSH back to normal.
Set work username for all machines.
[rpi01] arm: Add disable function for the SP804

The SP804 on the BCM2835 is yet another variant and isn't required
as there's another free running counter available.

Add a function to allow it to be disabled.

Signed-off-by: Simon Arlott <sa.me.uk>
[rpi01] bcm2708: Add BCM2708/BCM2835

Family: BCM2708
Model: BCM2835

Signed-off-by: popcornmix <popcornmix@gmail.com>
Signed-off-by: Dom Cobley <dc4@broadcom.com>
Signed-off-by: Simon Arlott <sa.me.uk>

bcm2708: Fix UART code in mach/uncompress.h
bcm2708: fix mach/debug-macro.S so that early printk works

Note that you need to boot the compressed kernel (zImage) so that the
UART is configured at boot, or your kernel will hang when it tries to
access the UART.

Signed-off-by: Chris Boot <bootc@bootc.net>

bcm2835: Add interrupt controller to device tree

Signed-off-by: Chris Boot <bootc@bootc.net>
Signed-off-by: Simon Arlott <sa.me.uk>

bcm2835: Add UART0 and UART1

Add the AMBA PL011 serial console device.
Also add the 16550-like UART1 (but disabled as we don't need it).

bcm2835: Add frame buffer display

Signed-off-by: popcornmix <popcornmix@gmail.com>
Signed-off-by: Dom Cobley <dc4@broadcom.com>
Signed-off-by: Simon Arlott <sa.me.uk>
[rpi02] bcm2708_wdog: Add watchdog

Variable timeout watchdog (1 to 16 seconds).

This is required to be able to reboot (using a 150us timeout).

Signed-off-by: Simon Arlott <sa.me.uk>
[rpi02] bcm-mbox: Add Broadcom VideoCore mailbox driver

Quite an interesting interface... with a very small message size

Signed-off-by: Simon Arlott <sa.me.uk>
[rpi02] bcm2708_fb: Add support for frame buffer display

Signed-off-by: popcornmix <popcornmix@gmail.com>

reorganise to use device tree

Signed-off-by: Simon Arlott <sa.me.uk>
[rpi02] video: Add Raspberry Pi logo

Signed-off-by: popcornmix <popcornmix@gmail.com>

Use logo_rpi_clut224 instead of overwriting logo_linux_clut224

Signed-off-by: Simon Arlott <sa.me.uk>
[rpi02] bcm-bell: Add Broadcom VideoCore doorbell driver

Signed-off-by: Simon Arlott <sa.me.uk>
[rpi02] bcm-vc-power: Add Broadcom VideoCore power driver

Signed-off-by: Simon Arlott <sa.me.uk>
[rpi02] pinctrl-bcm2708: Add pinctrl/pinmux support

TODO: pinconf support

Signed-off-by: Simon Arlott <sa.me.uk>

Rewrite including GPIO chip device

Signed-off-by: Chris Boot <bootc@bootc.net>
[rpi02] spi-bcm2708: SPI driver for bcm2708

This is an SPI driver for the BCM2708 platform including the BCM2835 as
used in the Raspberry Pi.

Thanks to csoutreach / A Robinson for his driver which I used as an
inspiration. You can find his version here:

http://piface.openlx.org.uk/raspberry-pi-spi-kernel-driver-available-for

Signed-off-by: Chris Boot <bootc@bootc.net>
[rpi02] i2c-bcm2708: BCM2708 I2C driver

Signed-off-by: Chris Boot <bootc@bootc.net>
Added specific webroot.
Code style in the wscript.
Added html sanitizing to client side.
workdetails - seeds
Merge branch 'castas' into develop
Client side fix for manaserv guild system

- kick code untested because no kick button exists yet

Reviewed-by: bjorn.
Tests for parseopts
Small refactor for parseopts, added tests
Merge branch 'master' of github.com:mde/geddy
Added fix to allow uppercase characters to validate URLs correctly
Return the correct code
Fix the testcode
Support $GENERATE (the bind extension).

It is even better than the bind one, because all records are
supported (as long as the output is valid)
cleanup and extra test
extra tests
movement and placement are almost done. completed out and events. moved some code to mx rc and enhanced it as well. other minor updated
moved movement component into dom module, updated mx globalize to include elements, removed setup and main all together, minor updated to assignment2
Mickey solved prime ribs.
removed list stuff
Whole bunch of behavioral changes
Fixed what Scott's last push broke.
Add UnicodeChars entries for quotation marks.

These correspond to the HTML entities &{l,r}{s,d}quo; hence the names
chosen.
Make "text" docfiles use Unicode quotes.

This is not ideal for people with Unicode off.
Progress with #40.
Handle an OOM corner case during a nursery collection.

	* sgen-gc.c: During a nursery collection, trim the pinning queue
	after we're done with it. Otherwise if we OOM and do pinning during
	promotion we can end up with a queue that contains interior pointers.
Handle OOM and finalizable objects.

	* sgen-gc.c: If we OOM when promoting a nursery object that
	is fin ready we end up with it in the fin ready list.

	Then, on the next nursery collection, if we don't scan such
	list we end up corrupting the heap.

	To handle it we scan the fin ready lists on each nursery
	collection. This helps us be future proof when finalizing
	objects while they are in the nursery becomes common.
Fix XmlTextWriter's use of NewLineHandling.

- Move the setting of newline_handling early enough that Initialize()
  can see it.
- Reduce the set of characters that trigger the slow path for
  attribute values for the NewLineHandling.None case.
- Rewrite the handling of \t, \r and \n to match the MS docs
  (which match the observed behavior of their implementation)
- Add some tests.
Merge pull request #288 from ewxrjk/xmlwriter

Fix XmlTextWriter's use of NewLineHandling.
Fixes a warning
Fix tests category
Add missing assembly references to test targets
Add br for markdown parser and ignore faves with removed posts
四分位数工具类修改
Merge branch 'master' of https://github.com/naily/iph
tricky examples of invalid programs
Added entry for r28658.
Check for received packet in rpc-grind.nse.

The script was checking the returned data, but not the status. When
status is false, data is actually an error message. So in case of a
timeout, the script was receiving nil, "TIMEOUT" and interpreting
"TIMEOUT" as a response from the server. It looked like this:

Discovered open port 1434/udp on 127.0.0.1
NSE: rpc-grind: RPC checking function response data is not RPC.
NSE: Target port 1434 is not a RPC port.

This was reported by Christopher Clements.
http://seclists.org/nmap-dev/2012/q3/685
Add credit for our usage of LibLinear for IPv6 OS detection
[#2784] User email is treated as sensitive data

Cherry-picked from:
	bd860dc58758356f36518586d1b70e1079700ba2
	7fe6c76a5408e41c5693c7ab4b4217e1547f9da4
	21ca66c77e9a618cec24709430e73c4409c1ac2c

Conflicts:

	ckan/controllers/user.py
	ckan/tests/lib/test_dictization.py
[#2750] Fix group controller using wrong schema

Fix group controller calling form_to_db_schema() from IGroupForm plugin
when it should be using db_to_form_schema()
Refactor DefaultGroupForm's form_to_db_schema_options()

The form_to_db_schema() methods of IGroupForm plugins were not being
called if those plugins inherited from DefaultGroupForm. Refactor it in
the same way as DefaultDatasetForm's form_to_db_schema_options() method
was recently refactored.  Make it call self.form_to_db_schema so that
the form_to_db_schema() methods of IGroupForm extensions get called.
Also make it call new form_to_db_schema_api_create() and
form_to_db_schema_api_update() methods which could potentially be
overridden by extensions also.
[#2570] Fix IGroupForm check_data_dict not being called

Make group_create() and group_update() call the check_data_dict()
methods of IGroupForm plugins, like package_create() and
package_update() do with IDatasetForm plugins.
[#2505] Fixes to the package install upgrade process
Merge branch '2505-docs-improvements-for-1.7.1'
Fix a deprecation warning

Loading the front page was logging "`order_by` deprecated please use
`sort`". Change HomeController to use sort and thereby get rid of the
warning.
app-mobilephone/wammu added
opAssign and opOpAssign now return T ref to allow chaining
Similar to std.complex
FBO now have EXT_framebuffer_object fallback
Basically working, but has a full-screen flicker problem
fix spawn parm for EdicCommand

to mean "force spawning, even if editor_spawn is set to False"
argparse will - if default is unset - default to False for
store_true actions. this means we never got None here, but always
false.

fixes issue #416
docs: more precise doc for EdidCommands spawn parm

closes #416
abort command on pre-hook exceptions

this makes ui.apply_command not call
a commands apply method if its pre-hook raised an exception.

closes #394
Merge branch '0.3-fix-spawn-416' into staging
introduce Attachment.write

that writes out its content to a given filehandle.
this is also used internally for save.
add helper.parse_mailcap_nametemplate

that splits a nametemplate string as given in the mailcap
sensibly into prefix and suffix
fix OpenAttachmentCommand

this makes OpenAttachmentCommand use settings.mailcap_find_match,
instead of the depricated getter.
Moreover, it makes the original mail part parameter available
to the handler (if requested in the mailcap entry) and
respects the given nametemplate

issue #419
use parse_mailcap_nametemplate in extract_body

.. helper that calls inline mime handler.
This is just to ensure we don't duplicate too much code
decode strftime return values in pretty_datetime

datetime.strftime returns UTF-8 encoded strings, not unicodes.
This decodes them for later use.
fixes #421
smarter pretty_datetime helper

* introduces "just now" for <60sec
* Nmin ago for <1hour
* uses 12 hour clock for minutes iff am/pm is used by locale
* lower case "yest" for yesterdays mails
introduce represent_datetime

settings helper that turns a given datetime obj into a unicode string representation according to locale and user settings:
1) look if a fixed 'timestamp_format' is given in the config
2) check if a 'timestamp_format' hook is defined
3) use :function:`pretty_datetime` as fallback

This introduces a new hook 'timestamp_format' that accepts a datetime
as only argument and returns a string

cf issue #415
doc: timestamp_format hook
use represent_datetime in the Threadline widgets

instead of pretty_datetime
use represent_datetime in Message.get_datestring

instead of pretty_datetime
Respect NOTMUCH_CONFIG environment variable.

Issue #422.
Support multiple emails per abook contact.

Issue #424.
Don't try to autocomplete blank email addresses.

If the email section is missing entirely, configobj defaults to an empty list.
But if it's present and empty ("email="), then it becomes a list of one blank
string.  Ignore these.

Also, fix spacing since I was using hard tabs.
Add notmuch-config switch back in.

The order of overriding is (highest priority first):
    command-line switch (--notmuch-config)
    environment variable ($NOTMUCH_CONFIG)
    default (~/.notmuch-config)
Fix invocation of pre_edit_translate hook.

Bodytext isn't written to the tempfile, content is.  This fixes the fact
that pre_edit_translate hooks currently do nothing.
Merge branch '0.3-fix-attachments-419' into staging
doc: added gpgme Mock classes

for api doc generation on rtfd.org
add test for application5 rental history
X::Syntax::Regex::Adverb
Optimize away control exception handlers in while/unit/repeat loops that don't need them.
Optimize away unrequired control exception handlers in for loops.
Fix a couple of small code-gen bugs.
Fix to unicode string handling.
moved the ascii art to below the charset meta
Merge branch 'v2' of github.com:pgte/lxjs into v2
Merge branch 'v2' of github.com:pgte/lxjs into v2
Hide text arrows on slideshow navigation
Added spinning icons to welcome social nav
Min-width body para resolver problem no iphone
Multiple background images because of iPhone image size limit
Changed RTP logo
[quodis] fixes from leihla
Mark TypeId constructor as explicit.
Some more progress. (Plus disabled the Blatter solver for now.)
Adds a new command-line option (-new_grad, for testing; will be removed later).

Corrects the computation of the vertical velocity near shelf fronts. Corrects the computation of the vertical velocity relative to the geoid above the ice.
Removes the -new_grad option.
Added initial work for WEDT
Merge branch 'master' of https://github.com/pj87/wedt
intflib/tasklib.py: turns out gaincal is already compatible with polcal

Just document the pol cal types. I'm probably going to get bitten in the ass
by different default values for some of the other parameters, though.
intflib/tasklib.py: implement fluxscale
Fix create_node method.

This was throwing a Spice::Error::NotFound exception because it was
generating a wrong path (/nodes//nodes/...). The get_node() call at the
end of the method returns the full node object. If just the attributes
were used to create the node object, many things were missing.
factor.cpp
Some more fix for cat with empty tables
Fixed and improved timing code:
 - reduced overhead and provided overhead estimates for more precise measurements
 - requires further cleanup and updating of affected code).
Updated and refactored the perform_benchmark() function template.
Quick-fix for failed gather_includes builds when cross compiling (missing exceptions support).
Applied the same quick-fix to move_reuse and postconfigure as for gather_includes.
(note to nt2 devs: there seems to be duplication between the CMakeLists.txt files for the three tools)
Fixed/updated remaining code affected by the timing code changes.
Added attempts to prevent the compiler and/or the CPU from reordering and/or removing calls to timing functions.
Changed the default time unit to microseconds.
Added and used the priority_booster_t utility class.
Added more todo and implementation notes.
Fixed bogus assertion failures in fill_with_real_data() and fill_with_imag_data() reproducible_random_data_provider member functions.
Fixed compilation with BOOST_NO_EXCEPTIONS.
Updated with the latest timing code changes.
Added timing code overhead information printing.
General refreshment of the Active Record Basics guide
remove the existing units db lookup per call and fixed a i18n str issue
First working version of ghost points, kind of slow
Follow GNU changelog conventions

Now http://www.gnu.org/prep/standards/html_node/Style-of-Change-Logs.html
can be processed by the parser
Fixed tests for ruby 1.8