Merge branch 'master' into rename-repo-url

This commit is contained in:
vvakame committed 2016-03-17 21:06:54 +09:00
commit 7de6c3dd94
1140 files changed
+179704 -179635

No files matched your search

+2 -2
View File
@@ -8,7 +8,7 @@
declare module "node-persist" {
type milliseconds = number;
module NodePersist {
namespace NodePersist {
export interface InitOptions {
dir?: string;
stringify?: (toSerialize: any)=>string;
@@ -19,7 +19,7 @@ declare module "node-persist" {
interval?: milliseconds|boolean;
ttl?: milliseconds|boolean;
}
export function init(options?: InitOptions, callback?: Function): Q.Promise<any>;
export function init(options?: InitOptions, callback?: Function): Q.Promise<any>;
export function initSync(options?: InitOptions): void;
export function getItem(key: string, callback?: (err: any, value: any)=>any): Q.Promise<any>;
export function getItemSync(key: string): any;